History

Merge tag 'v6.1-rc8' into rdma.git for-next

For dependencies in following patches

Jason Gunthorpe committed 3 years ago

Commit d69e8c62 parents 6cfe7bd 76dcd731377 files · +50615 −43700Browse files

Showing the changes to include/uapi (8 of 1377 files). Show all

Unified · Split

8 files
  1. include/uapi/drm/panfrost_drm.h +1 −1
  2. include/uapi/linux/audit.h +1 −1
  3. include/uapi/linux/capability.h +1 −1
  4. include/uapi/linux/idxd.h +1 −0
  5. include/uapi/linux/in.h +1 −0
  6. include/uapi/linux/io_uring.h +1 −1
  7. include/uapi/linux/ip.h +4 −2
  8. include/uapi/linux/ipv6.h +4 −2
include/uapi/drm/panfrost_drm.h+1−1
@@ -254,7 +254,7 @@ struct panfrost_dump_object_header { · 253 unmodified lines
254254 __u64 nbos;
255255 } reghdr;
256256
257− struct pan_bomap_hdr {
257+ struct {
258258 __u32 valid;
259259 __u64 iova;
260260 __u32 data[2];
include/uapi/linux/audit.h+1−1
@@ -187,7 +187,7 @@ · 186 unmodified lines
187187 #define AUDIT_MAX_KEY_LEN 256
188188 #define AUDIT_BITMASK_SIZE 64
189189 #define AUDIT_WORD(nr) ((__u32)((nr)/32))
190−#define AUDIT_BIT(nr) (1 << ((nr) - AUDIT_WORD(nr)*32))
190+#define AUDIT_BIT(nr) (1U << ((nr) - AUDIT_WORD(nr)*32))
191191
192192 #define AUDIT_SYSCALL_CLASSES 16
193193 #define AUDIT_CLASS_DIR_WRITE 0
include/uapi/linux/capability.h+1−1
@@ -426,7 +426,7 @@ struct vfs_ns_cap_data { · 425 unmodified lines
426426 */
427427
428428 #define CAP_TO_INDEX(x) ((x) >> 5) /* 1 << 5 == bits in __u32 */
429−#define CAP_TO_MASK(x) (1 << ((x) & 31)) /* mask for indexed __u32 */
429+#define CAP_TO_MASK(x) (1U << ((x) & 31)) /* mask for indexed __u32 */
430430
431431
432432 #endif /* _UAPI_LINUX_CAPABILITY_H */
include/uapi/linux/idxd.h+1−0
@@ -29,6 +29,7 @@ enum idxd_scmd_stat { · 28 unmodified lines
2929 IDXD_SCMD_WQ_NO_SIZE = 0x800e0000,
3030 IDXD_SCMD_WQ_NO_PRIV = 0x800f0000,
3131 IDXD_SCMD_WQ_IRQ_ERR = 0x80100000,
32+ IDXD_SCMD_WQ_USER_NO_IOMMU = 0x80110000,
3233 };
3334
3435 #define IDXD_SCMD_SOFTERR_MASK 0x80000000
include/uapi/linux/in.h+1−0
@@ -20,6 +20,7 @@ · 19 unmodified lines
2020 #define _UAPI_LINUX_IN_H
2121
2222 #include <linux/types.h>
23+#include <linux/stddef.h>
2324 #include <linux/libc-compat.h>
2425 #include <linux/socket.h>
2526
include/uapi/linux/io_uring.h+1−1
@@ -222,7 +222,7 @@ enum io_uring_op { · 221 unmodified lines
222222
223223 /*
224224 * sqe->uring_cmd_flags
225− * IORING_URING_CMD_FIXED use registered buffer; pass thig flag
225+ * IORING_URING_CMD_FIXED use registered buffer; pass this flag
226226 * along with setting sqe->buf_index.
227227 */
228228 #define IORING_URING_CMD_FIXED (1U << 0)
include/uapi/linux/ip.h+4−2
@@ -100,8 +100,10 @@ struct iphdr { · 99 unmodified lines
100100 __u8 ttl;
101101 __u8 protocol;
102102 __sum16 check;
103− __be32 saddr;
104− __be32 daddr;
103+ __struct_group(/* no tag */, addrs, /* no attrs */,
104+ __be32 saddr;
105+ __be32 daddr;
106+ );
105107 /*The options start here. */
106108 };
107109
include/uapi/linux/ipv6.h+4−2
@@ -130,8 +130,10 @@ struct ipv6hdr { · 129 unmodified lines
130130 __u8 nexthdr;
131131 __u8 hop_limit;
132132
133− struct in6_addr saddr;
134− struct in6_addr daddr;
133+ __struct_group(/* no tag */, addrs, /* no attrs */,
134+ struct in6_addr saddr;
135+ struct in6_addr daddr;
136+ );
135137 };
136138
137139