Backmerge tag 'v5.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next

Linux 5.18-rc5 There was a build fix for arm I wanted in drm-next, so backmerge rather then cherry-pick.

Dave Airlie committed 4 years ago

Commit e954d2c2 parents 15e2b41 672c0c51021 files · +8212 −5586Browse files

Showing the changes to include/uapi (6 of 1021 files). Show all

Unified · Split

6 files

@@ -42,7 +42,7 @@ typedef __s64 Elf64_Sxword; · 41 unmodified lines
42	42
43	43
44	44	/* ARM MTE memory tag segment type */
45		−#define PT_ARM_MEMTAG_MTE (PT_LOPROC + 0x1)
	45	+#define PT_AARCH64_MEMTAG_MTE (PT_LOPROC + 0x2)
46	46
47	47	/*
48	48	* Extended Numbering

@@ -182,7 +182,7 @@ struct fb_fix_screeninfo { · 181 unmodified lines
182	182	*
183	183	* For pseudocolor: offset and length should be the same for all color
184	184	* components. Offset specifies the position of the least significant bit
185		− * of the pallette index in a pixel value. Length indicates the number
	185	+ * of the palette index in a pixel value. Length indicates the number
186	186	* of available palette entries (i.e. # of entries = 1 << length).
187	187	*/
188	188	struct fb_bitfield {

@@ -662,6 +662,27 @@ · 661 unmodified lines
662	662	/* Select an area of screen to be copied */
663	663	#define KEY_SELECTIVE_SCREENSHOT 0x27a
664	664
	665	+/* Move the focus to the next or previous user controllable element within a UI container */
	666	+#define KEY_NEXT_ELEMENT 0x27b
	667	+#define KEY_PREVIOUS_ELEMENT 0x27c
	668	+
	669	+/* Toggle Autopilot engagement */
	670	+#define KEY_AUTOPILOT_ENGAGE_TOGGLE 0x27d
	671	+
	672	+/* Shortcut Keys */
	673	+#define KEY_MARK_WAYPOINT 0x27e
	674	+#define KEY_SOS 0x27f
	675	+#define KEY_NAV_CHART 0x280
	676	+#define KEY_FISHING_CHART 0x281
	677	+#define KEY_SINGLE_RANGE_RADAR 0x282
	678	+#define KEY_DUAL_RANGE_RADAR 0x283
	679	+#define KEY_RADAR_OVERLAY 0x284
	680	+#define KEY_TRADITIONAL_SONAR 0x285
	681	+#define KEY_CLEARVU_SONAR 0x286
	682	+#define KEY_SIDEVU_SONAR 0x287
	683	+#define KEY_NAV_INFO 0x288
	684	+#define KEY_BRIGHTNESS_MENU 0x289
	685	+
665	686	/*
666	687	* Some keyboards have keys which do not have a defined meaning, these keys
667	688	* are intended to be programmed / bound to macros by the user. For most

@@ -296,6 +296,7 @@ struct io_uring_params { · 295 unmodified lines
296	296	#define IORING_FEAT_NATIVE_WORKERS (1U << 9)
297	297	#define IORING_FEAT_RSRC_TAGS (1U << 10)
298	298	#define IORING_FEAT_CQE_SKIP (1U << 11)
	299	+#define IORING_FEAT_LINKED_FILE (1U << 12)
299	300
300	301	/*
301	302	* io_uring_register(2) opcodes and arguments

@@ -445,7 +445,13 @@ struct kvm_run { · 444 unmodified lines
445	445	#define KVM_SYSTEM_EVENT_RESET 2
446	446	#define KVM_SYSTEM_EVENT_CRASH 3
447	447	__u32 type;
448		− __u64 flags;
	448	+ __u32 ndata;
	449	+ union {
	450	+#ifndef __KERNEL__
	451	+ __u64 flags;
	452	+#endif
	453	+ __u64 data[16];
	454	+ };
449	455	} system_event;
450	456	/* KVM_EXIT_S390_STSI */
451	457	struct {
@@ -1144,6 +1150,8 @@ struct kvm_ppc_resize_hpt { · 692 unmodified lines
1144	1150	#define KVM_CAP_S390_MEM_OP_EXTENSION 211
1145	1151	#define KVM_CAP_PMU_CAPABILITY 212
1146	1152	#define KVM_CAP_DISABLE_QUIRKS2 213
	1153	+/* #define KVM_CAP_VM_TSC_CONTROL 214 */
	1154	+#define KVM_CAP_SYSTEM_EVENT_DATA 215
1147	1155
1148	1156	#ifdef KVM_CAP_IRQ_ROUTING
1149	1157

@@ -1,4 +1,7 @@
1	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
	2	+#ifndef _UAPI_LINUX_STDDEF_H
	3	+#define _UAPI_LINUX_STDDEF_H
	4	+
2	5	#include <linux/compiler_types.h>
3	6
4	7	#ifndef __always_inline
@@ -41,3 +44,4 @@ · 36 unmodified lines
41	44	struct { } __empty_ ## NAME; \
42	45	TYPE NAME[]; \
43	46	}
	47	+#endif