diff options
| author | Mark Brown <broonie@kernel.org> | 2024-06-23 02:03:15 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-06-23 02:03:15 +0300 |
| commit | 7bbb71150e57875126efacc2efdc678e3cede919 (patch) | |
| tree | 98214ae416931f4ff0fdf3aca0b99dc6afc72b28 /include/uapi/linux | |
| parent | ffe4b381e2ea97c7a5868dbe841c7522b1b0b408 (diff) | |
| parent | 6ba59ff4227927d3a8530fc2973b80e94b54d58f (diff) | |
| download | linux-7bbb71150e57875126efacc2efdc678e3cede919.tar.xz | |
regulator: Merge up v6.10-rc4
There are fixes for kselftest with clang that really help my CI.
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/input-event-codes.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/stat.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h index 03edf2ccdf6c..a4206723f503 100644 --- a/include/uapi/linux/input-event-codes.h +++ b/include/uapi/linux/input-event-codes.h @@ -618,6 +618,8 @@ #define KEY_CAMERA_ACCESS_ENABLE 0x24b /* Enables programmatic access to camera devices. (HUTRR72) */ #define KEY_CAMERA_ACCESS_DISABLE 0x24c /* Disables programmatic access to camera devices. (HUTRR72) */ #define KEY_CAMERA_ACCESS_TOGGLE 0x24d /* Toggles the current state of the camera access control. (HUTRR72) */ +#define KEY_ACCESSIBILITY 0x24e /* Toggles the system bound accessibility UI/command (HUTRR116) */ +#define KEY_DO_NOT_DISTURB 0x24f /* Toggles the system-wide "Do Not Disturb" control (HUTRR94)*/ #define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ #define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */ diff --git a/include/uapi/linux/stat.h b/include/uapi/linux/stat.h index 67626d535316..95770941ee2c 100644 --- a/include/uapi/linux/stat.h +++ b/include/uapi/linux/stat.h @@ -126,8 +126,8 @@ struct statx { __u64 stx_mnt_id; __u32 stx_dio_mem_align; /* Memory buffer alignment for direct I/O */ __u32 stx_dio_offset_align; /* File offset alignment for direct I/O */ - __u64 stx_subvol; /* Subvolume identifier */ /* 0xa0 */ + __u64 stx_subvol; /* Subvolume identifier */ __u64 __spare3[11]; /* Spare space for future expansion */ /* 0x100 */ }; |