Merge 6.8-rc5 into usb-next

We need the USB fixes in here as well.

Greg Kroah-Hartman committed 2 years ago

Commit a09ebb32 parents cf92b9d b401b62824 files · +6550 −3443Browse files

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

Unified · Split

4 files

@@ -305,6 +305,7 @@ struct drm_ivpu_submit { · 304 unmodified lines
305	305
306	306	/* drm_ivpu_bo_wait job status codes */
307	307	#define DRM_IVPU_JOB_STATUS_SUCCESS 0
	308	+#define DRM_IVPU_JOB_STATUS_ABORTED 256
308	309
309	310	/**
310	311	* struct drm_ivpu_bo_wait - Wait for BO to become inactive

@@ -91,8 +91,6 @@ enum iio_modifier { · 90 unmodified lines
91	91	IIO_MOD_CO2,
92	92	IIO_MOD_VOC,
93	93	IIO_MOD_LIGHT_UV,
94		− IIO_MOD_LIGHT_UVA,
95		− IIO_MOD_LIGHT_UVB,
96	94	IIO_MOD_LIGHT_DUV,
97	95	IIO_MOD_PM1,
98	96	IIO_MOD_PM2P5,
@@ -107,6 +105,8 @@ enum iio_modifier { · 8 unmodified lines
107	105	IIO_MOD_PITCH,
108	106	IIO_MOD_YAW,
109	107	IIO_MOD_ROLL,
	108	+ IIO_MOD_LIGHT_UVA,
	109	+ IIO_MOD_LIGHT_UVB,
110	110	};
111	111
112	112	enum iio_event_type {

@@ -285,9 +285,11 @@ enum nft_rule_attributes { · 284 unmodified lines
285	285	/**
286	286	* enum nft_rule_compat_flags - nf_tables rule compat flags
287	287	*
	288	+ * @NFT_RULE_COMPAT_F_UNUSED: unused
288	289	* @NFT_RULE_COMPAT_F_INV: invert the check result
289	290	*/
290	291	enum nft_rule_compat_flags {
	292	+ NFT_RULE_COMPAT_F_UNUSED = (1 << 0),
291	293	NFT_RULE_COMPAT_F_INV = (1 << 1),
292	294	NFT_RULE_COMPAT_F_MASK = NFT_RULE_COMPAT_F_INV,
293	295	};

@@ -31,7 +31,10 @@ struct ioctl_gntalloc_alloc_gref { · 30 unmodified lines
31	31	__u64 index;
32	32	/* The grant references of the newly created grant, one per page */
33	33	/* Variable size, depending on count */
34		− __u32 gref_ids[1];
	34	+ union {
	35	+ __u32 gref_ids[1];
	36	+ __DECLARE_FLEX_ARRAY(__u32, gref_ids_flex);
	37	+ };
35	38	};
36	39
37	40	#define GNTALLOC_FLAG_WRITABLE 1

Keyboard shortcuts