History

Merge branch 'kvm-master' into kvm-next

Fixes to get_mmio_spte, destined to 5.10 stable branch.

Paolo Bonzini committed 5 years ago

Commit bc351f02 parents d45f89f 9aa41871108 files · +13607 −7721Browse files

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

Unified · Split

4 files
  1. include/uapi/linux/bpf.h +2 −2
  2. include/uapi/linux/devlink.h +2 −0
  3. include/uapi/linux/openvswitch.h +2 −0
  4. include/uapi/linux/stat.h +6 −3
include/uapi/linux/bpf.h+2−2
@@ -3897,8 +3897,8 @@ union bpf_attr { · 3896 unmodified lines
38973897 FN(seq_printf_btf), \
38983898 FN(skb_cgroup_classid), \
38993899 FN(redirect_neigh), \
3900− FN(bpf_per_cpu_ptr), \
3901− FN(bpf_this_cpu_ptr), \
3900+ FN(per_cpu_ptr), \
3901+ FN(this_cpu_ptr), \
39023902 FN(redirect_peer), \
39033903 /* */
39043904
include/uapi/linux/devlink.h+2−0
@@ -526,6 +526,8 @@ enum devlink_attr { · 525 unmodified lines
526526 DEVLINK_ATTR_RELOAD_STATS_LIMIT, /* u8 */
527527 DEVLINK_ATTR_RELOAD_STATS_VALUE, /* u32 */
528528 DEVLINK_ATTR_REMOTE_RELOAD_STATS, /* nested */
529+ DEVLINK_ATTR_RELOAD_ACTION_INFO, /* nested */
530+ DEVLINK_ATTR_RELOAD_ACTION_STATS, /* nested */
529531
530532 /* add new attributes above here, update the policy in devlink.c */
531533
include/uapi/linux/openvswitch.h+2−0
@@ -1058,4 +1058,6 @@ enum ovs_dec_ttl_attr { · 1057 unmodified lines
10581058 __OVS_DEC_TTL_ATTR_MAX
10591059 };
10601060
1061+#define OVS_DEC_TTL_ATTR_MAX (__OVS_DEC_TTL_ATTR_MAX - 1)
1062+
10611063 #endif /* _LINUX_OPENVSWITCH_H */
include/uapi/linux/stat.h+6−3
@@ -171,9 +171,12 @@ struct statx { · 170 unmodified lines
171171 * be of use to ordinary userspace programs such as GUIs or ls rather than
172172 * specialised tools.
173173 *
174− * Note that the flags marked [I] correspond to generic FS_IOC_FLAGS
174+ * Note that the flags marked [I] correspond to the FS_IOC_SETFLAGS flags
175175 * semantically. Where possible, the numerical value is picked to correspond
176− * also.
176+ * also. Note that the DAX attribute indicates that the file is in the CPU
177+ * direct access state. It does not correspond to the per-inode flag that
178+ * some filesystems support.
179+ *
177180 */
178181 #define STATX_ATTR_COMPRESSED 0x00000004 /* [I] File is compressed by the fs */
179182 #define STATX_ATTR_IMMUTABLE 0x00000010 /* [I] File is marked immutable */
@@ -183,7 +186,7 @@ struct statx { · 3 unmodified lines
183186 #define STATX_ATTR_AUTOMOUNT 0x00001000 /* Dir: Automount trigger */
184187 #define STATX_ATTR_MOUNT_ROOT 0x00002000 /* Root of a mount */
185188 #define STATX_ATTR_VERITY 0x00100000 /* [I] Verity protected file */
186−#define STATX_ATTR_DAX 0x00002000 /* [I] File is DAX */
189+#define STATX_ATTR_DAX 0x00200000 /* File is currently in DAX state */
187190
188191
189192 #endif /* _UAPI_LINUX_STAT_H */