Merge tag 'v6.6-rc7' into sched/core, to pick up fixes

Pick up recent sched/urgent fixes merged upstream.

Ingo Molnar committed 3 years ago

Commit 4e5b65a2 parents 4c456c9 05d3ef8831 files · +8728 −3953Browse files

Showing the changes to include/uapi (2 of 831 files). Show all

Unified · Split

2 files

@@ -44,6 +44,16 @@ extern "C" { · 43 unmodified lines
44	44	#define NOUVEAU_GETPARAM_PTIMER_TIME 14
45	45	#define NOUVEAU_GETPARAM_HAS_BO_USAGE 15
46	46	#define NOUVEAU_GETPARAM_HAS_PAGEFLIP 16
	47	+
	48	+/*
	49	+ * NOUVEAU_GETPARAM_EXEC_PUSH_MAX - query max pushes through getparam
	50	+ *
	51	+ * Query the maximum amount of IBs that can be pushed through a single
	52	+ * &drm_nouveau_exec structure and hence a single &DRM_IOCTL_NOUVEAU_EXEC
	53	+ * ioctl().
	54	+ */
	55	+#define NOUVEAU_GETPARAM_EXEC_PUSH_MAX 17
	56	+
47	57	struct drm_nouveau_getparam {
48	58	__u64 param;
49	59	__u64 value;

@@ -18,11 +18,7 @@ struct sockaddr_ll { · 17 unmodified lines
18	18	unsigned short sll_hatype;
19	19	unsigned char sll_pkttype;
20	20	unsigned char sll_halen;
21		− union {
22		− unsigned char sll_addr[8];
23		− /* Actual length is in sll_halen. */
24		− __DECLARE_FLEX_ARRAY(unsigned char, sll_addr_flex);
25		− };
	21	+ unsigned char sll_addr[8];
26	22	};
27	23
28	24	/* Packet types */

Keyboard shortcuts