Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR. No conflicts, no adjacent changes.

Jakub Kicinski committed 2 years ago

Commit 4c7d3d72 parents 3ec8d75 d20f6b3229 files · +2282 −1349Browse files

Showing the changes to include/uapi (2 of 229 files). Show all

Unified · Split

2 files

@@ -618,6 +618,8 @@ · 617 unmodified lines
618	618	#define KEY_CAMERA_ACCESS_ENABLE 0x24b /* Enables programmatic access to camera devices. (HUTRR72) */
619	619	#define KEY_CAMERA_ACCESS_DISABLE 0x24c /* Disables programmatic access to camera devices. (HUTRR72) */
620	620	#define KEY_CAMERA_ACCESS_TOGGLE 0x24d /* Toggles the current state of the camera access control. (HUTRR72) */
	621	+#define KEY_ACCESSIBILITY 0x24e /* Toggles the system bound accessibility UI/command (HUTRR116) */
	622	+#define KEY_DO_NOT_DISTURB 0x24f /* Toggles the system-wide "Do Not Disturb" control (HUTRR94)*/
621	623
622	624	#define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */
623	625	#define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */

@@ -126,8 +126,8 @@ struct statx { · 125 unmodified lines
126	126	__u64 stx_mnt_id;
127	127	__u32 stx_dio_mem_align; /* Memory buffer alignment for direct I/O */
128	128	__u32 stx_dio_offset_align; /* File offset alignment for direct I/O */
129		− __u64 stx_subvol; /* Subvolume identifier */
130	129	/* 0xa0 */
	130	+ __u64 stx_subvol; /* Subvolume identifier */
131	131	__u64 __spare3[11]; /* Spare space for future expansion */
132	132	/* 0x100 */
133	133	};