diff options
| author | Joel Stanley <joel@jms.id.au> | 2022-03-22 15:24:37 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2022-03-22 15:24:45 +0300 |
| commit | 8505c31863aadb65c2d08381eca8fc0baaa3babb (patch) | |
| tree | 89af165ec212ab6e5f37627ae44417eb6055a7d1 /include/uapi | |
| parent | b3b33a63865dc178212ef70f87acf9ab64436567 (diff) | |
| parent | 0464ab17184b8fdec6676fabe76059b90e54e74f (diff) | |
| download | linux-8505c31863aadb65c2d08381eca8fc0baaa3babb.tar.xz | |
Merge tag 'v5.15.30' into dev-5.15
This is the 5.15.30 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/input-event-codes.h | 4 | ||||
| -rw-r--r-- | include/uapi/linux/xfrm.h | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h index 225ec87d4f22..7989d9483ea7 100644 --- a/include/uapi/linux/input-event-codes.h +++ b/include/uapi/linux/input-event-codes.h @@ -278,7 +278,8 @@ #define KEY_PAUSECD 201 #define KEY_PROG3 202 #define KEY_PROG4 203 -#define KEY_DASHBOARD 204 /* AL Dashboard */ +#define KEY_ALL_APPLICATIONS 204 /* AC Desktop Show All Applications */ +#define KEY_DASHBOARD KEY_ALL_APPLICATIONS #define KEY_SUSPEND 205 #define KEY_CLOSE 206 /* AC Close */ #define KEY_PLAY 207 @@ -612,6 +613,7 @@ #define KEY_ASSISTANT 0x247 /* AL Context-aware desktop assistant */ #define KEY_KBD_LAYOUT_NEXT 0x248 /* AC Next Keyboard Layout Select */ #define KEY_EMOJI_PICKER 0x249 /* Show/hide emoji picker (HUTRR101) */ +#define KEY_DICTATE 0x24a /* Start or Stop Voice Dictation Session (HUTRR99) */ #define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ #define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */ diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h index 4e29d7851890..65e13a099b1a 100644 --- a/include/uapi/linux/xfrm.h +++ b/include/uapi/linux/xfrm.h @@ -511,6 +511,12 @@ struct xfrm_user_offload { int ifindex; __u8 flags; }; +/* This flag was exposed without any kernel code that supporting it. + * Unfortunately, strongswan has the code that uses sets this flag, + * which makes impossible to reuse this bit. + * + * So leave it here to make sure that it won't be reused by mistake. + */ #define XFRM_OFFLOAD_IPV6 1 #define XFRM_OFFLOAD_INBOUND 2 |