History

Merge tag 'v5.17-rc8' into sched/core, to pick up fixes

Ingo Molnar committed 4 years ago

Commit ccdbf332 parents ccacfe5 09688c0689 files · +7397 −2987Browse files

Showing the changes to include/uapi (4 of 689 files). Show all

Unified · Split

4 files
  1. include/uapi/linux/input-event-codes.h +3 −1
  2. include/uapi/linux/kvm.h +1 −0
  3. include/uapi/linux/magic.h +1 −0
  4. include/uapi/linux/xfrm.h +6 −0
include/uapi/linux/input-event-codes.h+3−1
@@ -278,7 +278,8 @@ · 277 unmodified lines
278278 #define KEY_PAUSECD 201
279279 #define KEY_PROG3 202
280280 #define KEY_PROG4 203
281−#define KEY_DASHBOARD 204 /* AL Dashboard */
281+#define KEY_ALL_APPLICATIONS 204 /* AC Desktop Show All Applications */
282+#define KEY_DASHBOARD KEY_ALL_APPLICATIONS
282283 #define KEY_SUSPEND 205
283284 #define KEY_CLOSE 206 /* AC Close */
284285 #define KEY_PLAY 207
@@ -612,6 +613,7 @@ · 327 unmodified lines
612613 #define KEY_ASSISTANT 0x247 /* AL Context-aware desktop assistant */
613614 #define KEY_KBD_LAYOUT_NEXT 0x248 /* AC Next Keyboard Layout Select */
614615 #define KEY_EMOJI_PICKER 0x249 /* Show/hide emoji picker (HUTRR101) */
616+#define KEY_DICTATE 0x24a /* Start or Stop Voice Dictation Session (HUTRR99) */
615617
616618 #define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */
617619 #define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */
include/uapi/linux/kvm.h+1−0
@@ -1134,6 +1134,7 @@ struct kvm_ppc_resize_hpt { · 1133 unmodified lines
11341134 #define KVM_CAP_VM_GPA_BITS 207
11351135 #define KVM_CAP_XSAVE2 208
11361136 #define KVM_CAP_SYS_ATTRIBUTES 209
1137+#define KVM_CAP_PPC_AIL_MODE_3 210
11371138
11381139 #ifdef KVM_CAP_IRQ_ROUTING
11391140
include/uapi/linux/magic.h+1−0
@@ -36,6 +36,7 @@ · 35 unmodified lines
3636 #define EFIVARFS_MAGIC 0xde5e81e4
3737 #define HOSTFS_SUPER_MAGIC 0x00c0ffee
3838 #define OVERLAYFS_SUPER_MAGIC 0x794c7630
39+#define FUSE_SUPER_MAGIC 0x65735546
3940
4041 #define MINIX_SUPER_MAGIC 0x137F /* minix v1 fs, 14 char names */
4142 #define MINIX_SUPER_MAGIC2 0x138F /* minix v1 fs, 30 char names */
include/uapi/linux/xfrm.h+6−0
@@ -511,6 +511,12 @@ struct xfrm_user_offload { · 510 unmodified lines
511511 int ifindex;
512512 __u8 flags;
513513 };
514+/* This flag was exposed without any kernel code that supporting it.
515+ * Unfortunately, strongswan has the code that uses sets this flag,
516+ * which makes impossible to reuse this bit.
517+ *
518+ * So leave it here to make sure that it won't be reused by mistake.
519+ */
514520 #define XFRM_OFFLOAD_IPV6 1
515521 #define XFRM_OFFLOAD_INBOUND 2
516522