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
3897 FN(seq_printf_btf), \3897 FN(seq_printf_btf), \
3898 FN(skb_cgroup_classid), \3898 FN(skb_cgroup_classid), \
3899 FN(redirect_neigh), \3899 FN(redirect_neigh), \
3900 FN(bpf_per_cpu_ptr), \3900 FN(per_cpu_ptr), \
3901 FN(bpf_this_cpu_ptr), \3901 FN(this_cpu_ptr), \
3902 FN(redirect_peer), \3902 FN(redirect_peer), \
3903 /* */3903 /* */
3904 3904
include/uapi/linux/devlink.h+2−0
@@ -526,6 +526,8 @@ enum devlink_attr { · 525 unmodified lines
526 DEVLINK_ATTR_RELOAD_STATS_LIMIT, /* u8 */526 DEVLINK_ATTR_RELOAD_STATS_LIMIT, /* u8 */
527 DEVLINK_ATTR_RELOAD_STATS_VALUE, /* u32 */527 DEVLINK_ATTR_RELOAD_STATS_VALUE, /* u32 */
528 DEVLINK_ATTR_REMOTE_RELOAD_STATS, /* nested */528 DEVLINK_ATTR_REMOTE_RELOAD_STATS, /* nested */
529 DEVLINK_ATTR_RELOAD_ACTION_INFO, /* nested */
530 DEVLINK_ATTR_RELOAD_ACTION_STATS, /* nested */
529 531
530 /* add new attributes above here, update the policy in devlink.c */532 /* add new attributes above here, update the policy in devlink.c */
531 533
include/uapi/linux/openvswitch.h+2−0
@@ -1058,4 +1058,6 @@ enum ovs_dec_ttl_attr { · 1057 unmodified lines
1058 __OVS_DEC_TTL_ATTR_MAX1058 __OVS_DEC_TTL_ATTR_MAX
1059};1059};
1060 1060
1061#define OVS_DEC_TTL_ATTR_MAX (__OVS_DEC_TTL_ATTR_MAX - 1)
1062
1061#endif /* _LINUX_OPENVSWITCH_H */1063#endif /* _LINUX_OPENVSWITCH_H */
include/uapi/linux/stat.h+6−3
@@ -171,9 +171,12 @@ struct statx { · 170 unmodified lines
171 * be of use to ordinary userspace programs such as GUIs or ls rather than171 * be of use to ordinary userspace programs such as GUIs or ls rather than
172 * specialised tools.172 * specialised tools.
173 *173 *
174 * Note that the flags marked [I] correspond to generic FS_IOC_FLAGS174 * Note that the flags marked [I] correspond to the FS_IOC_SETFLAGS flags
175 * semantically. Where possible, the numerical value is picked to correspond175 * 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 *
177 */180 */
178#define STATX_ATTR_COMPRESSED 0x00000004 /* [I] File is compressed by the fs */181#define STATX_ATTR_COMPRESSED 0x00000004 /* [I] File is compressed by the fs */
179#define STATX_ATTR_IMMUTABLE 0x00000010 /* [I] File is marked immutable */182#define STATX_ATTR_IMMUTABLE 0x00000010 /* [I] File is marked immutable */
@@ -183,7 +186,7 @@ struct statx { · 3 unmodified lines
183#define STATX_ATTR_AUTOMOUNT 0x00001000 /* Dir: Automount trigger */186#define STATX_ATTR_AUTOMOUNT 0x00001000 /* Dir: Automount trigger */
184#define STATX_ATTR_MOUNT_ROOT 0x00002000 /* Root of a mount */187#define STATX_ATTR_MOUNT_ROOT 0x00002000 /* Root of a mount */
185#define STATX_ATTR_VERITY 0x00100000 /* [I] Verity protected file */188#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 */
187 190
188 191
189#endif /* _UAPI_LINUX_STAT_H */192#endif /* _UAPI_LINUX_STAT_H */