History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR. No conflicts, no adjacent changes.

Jakub Kicinski committed 2 years ago

Commit 4c7d3d72 parents 3ec8d75 d20f6b3229 files · +2282 −1349Browse files

Showing the changes to tools/include/uapi/linux (2 of 229 files). Show all

Unified · Split

2 files
  1. tools/include/uapi/linux/kvm.h +2 −2
  2. tools/include/uapi/linux/stat.h +3 −1
tools/include/uapi/linux/kvm.h+2−2
@@ -1221,9 +1221,9 @@ struct kvm_vfio_spapr_tce { · 1220 unmodified lines
1221/* Available with KVM_CAP_SPAPR_RESIZE_HPT */1221/* Available with KVM_CAP_SPAPR_RESIZE_HPT */
1222#define KVM_PPC_RESIZE_HPT_PREPARE _IOR(KVMIO, 0xad, struct kvm_ppc_resize_hpt)1222#define KVM_PPC_RESIZE_HPT_PREPARE _IOR(KVMIO, 0xad, struct kvm_ppc_resize_hpt)
1223#define KVM_PPC_RESIZE_HPT_COMMIT _IOR(KVMIO, 0xae, struct kvm_ppc_resize_hpt)1223#define KVM_PPC_RESIZE_HPT_COMMIT _IOR(KVMIO, 0xae, struct kvm_ppc_resize_hpt)
1224/* Available with KVM_CAP_PPC_RADIX_MMU or KVM_CAP_PPC_MMU_HASH_V3 */1224/* Available with KVM_CAP_PPC_MMU_RADIX or KVM_CAP_PPC_MMU_HASH_V3 */
1225#define KVM_PPC_CONFIGURE_V3_MMU _IOW(KVMIO, 0xaf, struct kvm_ppc_mmuv3_cfg)1225#define KVM_PPC_CONFIGURE_V3_MMU _IOW(KVMIO, 0xaf, struct kvm_ppc_mmuv3_cfg)
1226/* Available with KVM_CAP_PPC_RADIX_MMU */1226/* Available with KVM_CAP_PPC_MMU_RADIX */
1227#define KVM_PPC_GET_RMMU_INFO _IOW(KVMIO, 0xb0, struct kvm_ppc_rmmu_info)1227#define KVM_PPC_GET_RMMU_INFO _IOW(KVMIO, 0xb0, struct kvm_ppc_rmmu_info)
1228/* Available with KVM_CAP_PPC_GET_CPU_CHAR */1228/* Available with KVM_CAP_PPC_GET_CPU_CHAR */
1229#define KVM_PPC_GET_CPU_CHAR _IOR(KVMIO, 0xb1, struct kvm_ppc_cpu_char)1229#define KVM_PPC_GET_CPU_CHAR _IOR(KVMIO, 0xb1, struct kvm_ppc_cpu_char)
tools/include/uapi/linux/stat.h+3−1
@@ -126,8 +126,9 @@ struct statx { · 125 unmodified lines
126 __u64 stx_mnt_id;126 __u64 stx_mnt_id;
127 __u32 stx_dio_mem_align; /* Memory buffer alignment for direct I/O */127 __u32 stx_dio_mem_align; /* Memory buffer alignment for direct I/O */
128 __u32 stx_dio_offset_align; /* File offset alignment for direct I/O */128 __u32 stx_dio_offset_align; /* File offset alignment for direct I/O */
129 __u64 stx_subvol; /* Subvolume identifier */
129 /* 0xa0 */130 /* 0xa0 */
130 __u64 __spare3[12]; /* Spare space for future expansion */131 __u64 __spare3[11]; /* Spare space for future expansion */
131 /* 0x100 */132 /* 0x100 */
132};133};
133 134
@@ -155,6 +156,7 @@ struct statx { · 21 unmodified lines
155#define STATX_MNT_ID 0x00001000U /* Got stx_mnt_id */156#define STATX_MNT_ID 0x00001000U /* Got stx_mnt_id */
156#define STATX_DIOALIGN 0x00002000U /* Want/got direct I/O alignment info */157#define STATX_DIOALIGN 0x00002000U /* Want/got direct I/O alignment info */
157#define STATX_MNT_ID_UNIQUE 0x00004000U /* Want/got extended stx_mount_id */158#define STATX_MNT_ID_UNIQUE 0x00004000U /* Want/got extended stx_mount_id */
159#define STATX_SUBVOL 0x00008000U /* Want/got stx_subvol */
158 160
159#define STATX__RESERVED 0x80000000U /* Reserved for future struct statx expansion */161#define STATX__RESERVED 0x80000000U /* Reserved for future struct statx expansion */
160 162