Backmerge tag 'v6.1-rc6' into drm-next

Linux 6.1-rc6 This is needed for drm-misc-next and tegra.

Dave Airlie committed 3 years ago

Commit d47f9582 parents 3d335a5 eb708141250 files · +49065 −42374Browse files

Showing the changes to include/uapi (10 of 1250 files). Show all

Unified · Split

10 files

@@ -254,7 +254,7 @@ struct panfrost_dump_object_header { · 253 unmodified lines
254	254	__u64 nbos;
255	255	} reghdr;
256	256
257		− struct pan_bomap_hdr {
	257	+ struct {
258	258	__u32 valid;
259	259	__u64 iova;
260	260	__u32 data[2];

@@ -187,7 +187,7 @@ · 186 unmodified lines
187	187	#define AUDIT_MAX_KEY_LEN 256
188	188	#define AUDIT_BITMASK_SIZE 64
189	189	#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))
191	191
192	192	#define AUDIT_SYSCALL_CLASSES 16
193	193	#define AUDIT_CLASS_DIR_WRITE 0

@@ -426,7 +426,7 @@ struct vfs_ns_cap_data { · 425 unmodified lines
426	426	*/
427	427
428	428	#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 */
430	430
431	431
432	432	#endif /* _UAPI_LINUX_CAPABILITY_H */

@@ -29,6 +29,7 @@ enum idxd_scmd_stat { · 28 unmodified lines
29	29	IDXD_SCMD_WQ_NO_SIZE = 0x800e0000,
30	30	IDXD_SCMD_WQ_NO_PRIV = 0x800f0000,
31	31	IDXD_SCMD_WQ_IRQ_ERR = 0x80100000,
	32	+ IDXD_SCMD_WQ_USER_NO_IOMMU = 0x80110000,
32	33	};
33	34
34	35	#define IDXD_SCMD_SOFTERR_MASK 0x80000000

@@ -222,7 +222,7 @@ enum io_uring_op { · 221 unmodified lines
222	222
223	223	/*
224	224	* 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
226	226	* along with setting sqe->buf_index.
227	227	*/
228	228	#define IORING_URING_CMD_FIXED (1U << 0)

@@ -100,8 +100,10 @@ struct iphdr { · 99 unmodified lines
100	100	__u8 ttl;
101	101	__u8 protocol;
102	102	__sum16 check;
103		− __be32 saddr;
104		− __be32 daddr;
	103	+ __struct_group(/* no tag /, addrs, / no attrs */,
	104	+ __be32 saddr;
	105	+ __be32 daddr;
	106	+ );
105	107	/The options start here. /
106	108	};
107	109

@@ -130,8 +130,10 @@ struct ipv6hdr { · 129 unmodified lines
130	130	__u8 nexthdr;
131	131	__u8 hop_limit;
132	132
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	+ );
135	137	};
136	138
137	139

@@ -1337,7 +1337,7 @@ union perf_mem_data_src { · 1336 unmodified lines
1337	1337	#define PERF_MEM_LVLNUM_L3 0x03 /* L3 */
1338	1338	#define PERF_MEM_LVLNUM_L4 0x04 /* L4 */
1339	1339	/* 5-0x8 available */
1340		−#define PERF_MEM_LVLNUM_EXTN_MEM 0x09 /* Extension memory */
	1340	+#define PERF_MEM_LVLNUM_CXL 0x09 /* CXL */
1341	1341	#define PERF_MEM_LVLNUM_IO 0x0a /* I/O */
1342	1342	#define PERF_MEM_LVLNUM_ANY_CACHE 0x0b /* Any cache */
1343	1343	#define PERF_MEM_LVLNUM_LFB 0x0c /* LFB */

@@ -1601,7 +1601,8 @@ struct v4l2_bt_timings { · 1600 unmodified lines
1601	1601	((bt)->width + V4L2_DV_BT_BLANKING_WIDTH(bt))
1602	1602	#define V4L2_DV_BT_BLANKING_HEIGHT(bt) \
1603	1603	((bt)->vfrontporch + (bt)->vsync + (bt)->vbackporch + \
1604		− (bt)->il_vfrontporch + (bt)->il_vsync + (bt)->il_vbackporch)
	1604	+ ((bt)->interlaced ? \
	1605	+ ((bt)->il_vfrontporch + (bt)->il_vsync + (bt)->il_vbackporch) : 0))
1605	1606	#define V4L2_DV_BT_FRAME_HEIGHT(bt) \
1606	1607	((bt)->height + V4L2_DV_BT_BLANKING_HEIGHT(bt))
1607	1608