Merge tag 'v5.17-rc5' into sched/core, to resolve conflicts

New conflicts in sched/core due to the following upstream fixes: 44585f7bc0cb ("psi: fix "defined but not used" warnings when CONFIG_PROC_FS=n") a06247c6804f ("psi: Fix uaf issue when psi trigger is destroyed while being polled") Conflicts: include/linux/psi_types.h kernel/sched/psi.c

Ingo Molnar committed 4 years ago

Commit 6255b482 parents 1b2d345 cfb92441212 files · +13287 −6877Browse files

Showing the changes to include/uapi (7 of 1212 files). Show all

Unified · Split

7 files

include/uapi/linux/cyclades.h +35 −0
include/uapi/linux/kvm.h +4 −3
include/uapi/linux/netfilter/nf_conntrack_common.h +1 −1
include/uapi/linux/perf_event.h +2 −0
include/uapi/linux/smc_diag.h +5 −6
include/uapi/sound/asound.h +3 −1
include/uapi/xen/gntdev.h +7 −1

include/uapi/linux/cyclades.h+35−0

@@ -0,0 +1,35 @@
	1	+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
	2	+
	3	+#ifndef _UAPI_LINUX_CYCLADES_H
	4	+#define _UAPI_LINUX_CYCLADES_H
	5	+
	6	+#warning "Support for features provided by this header has been removed"
	7	+#warning "Please consider updating your code"
	8	+
	9	+struct cyclades_monitor {
	10	+ unsigned long int_count;
	11	+ unsigned long char_count;
	12	+ unsigned long char_max;
	13	+ unsigned long char_last;
	14	+};
	15	+
	16	+#define CYGETMON 0x435901
	17	+#define CYGETTHRESH 0x435902
	18	+#define CYSETTHRESH 0x435903
	19	+#define CYGETDEFTHRESH 0x435904
	20	+#define CYSETDEFTHRESH 0x435905
	21	+#define CYGETTIMEOUT 0x435906
	22	+#define CYSETTIMEOUT 0x435907
	23	+#define CYGETDEFTIMEOUT 0x435908
	24	+#define CYSETDEFTIMEOUT 0x435909
	25	+#define CYSETRFLOW 0x43590a
	26	+#define CYGETRFLOW 0x43590b
	27	+#define CYSETRTSDTR_INV 0x43590c
	28	+#define CYGETRTSDTR_INV 0x43590d
	29	+#define CYZSETPOLLCYCLE 0x43590e
	30	+#define CYZGETPOLLCYCLE 0x43590f
	31	+#define CYGETCD1400VER 0x435910
	32	+#define CYSETWAIT 0x435912
	33	+#define CYGETWAIT 0x435913
	34	+
	35	+#endif /* _UAPI_LINUX_CYCLADES_H */

include/uapi/linux/kvm.h+4−3

@@ -1133,6 +1133,7 @@ struct kvm_ppc_resize_hpt { · 1132 unmodified lines
1133	1133	#define KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM 206
1134	1134	#define KVM_CAP_VM_GPA_BITS 207
1135	1135	#define KVM_CAP_XSAVE2 208
	1136	+#define KVM_CAP_SYS_ATTRIBUTES 209
1136	1137
1137	1138	#ifdef KVM_CAP_IRQ_ROUTING
1138	1139
@@ -1623,9 +1624,6 @@ struct kvm_enc_region { · 484 unmodified lines
1623	1624	#define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3)
1624	1625	#define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4)
1625	1626
1626		−/* Available with KVM_CAP_XSAVE2 */
1627		−#define KVM_GET_XSAVE2 _IOR(KVMIO, 0xcf, struct kvm_xsave)
1628		−
1629	1627	struct kvm_s390_pv_sec_parm {
1630	1628	__u64 origin;
1631	1629	__u64 length;
@@ -2047,4 +2045,7 @@ struct kvm_stats_desc { · 415 unmodified lines
2047	2045
2048	2046	#define KVM_GET_STATS_FD _IO(KVMIO, 0xce)
2049	2047
	2048	+/* Available with KVM_CAP_XSAVE2 */
	2049	+#define KVM_GET_XSAVE2 _IOR(KVMIO, 0xcf, struct kvm_xsave)
	2050	+
2050	2051	#endif /* __LINUX_KVM_H */

include/uapi/linux/netfilter/nf_conntrack_common.h+1−1

@@ -106,7 +106,7 @@ enum ip_conntrack_status { · 105 unmodified lines
106	106	IPS_NAT_CLASH = IPS_UNTRACKED,
107	107	#endif
108	108
109		− /* Conntrack got a helper explicitly attached via CT target. */
	109	+ /* Conntrack got a helper explicitly attached (ruleset, ctnetlink). */
110	110	IPS_HELPER_BIT = 13,
111	111	IPS_HELPER = (1 << IPS_HELPER_BIT),
112	112

include/uapi/linux/perf_event.h+2−0

@@ -465,6 +465,8 @@ struct perf_event_attr { · 464 unmodified lines
465	465	/*
466	466	* User provided data if sigtrap=1, passed back to user via
467	467	* siginfo_t::si_perf_data, e.g. to permit user to identify the event.
	468	+ * Note, siginfo_t::si_perf_data is long-sized, and sig_data will be
	469	+ * truncated accordingly on 32 bit architectures.
468	470	*/
469	471	__u64 sig_data;
470	472	};

include/uapi/linux/smc_diag.h+5−6

@@ -84,12 +84,11 @@ struct smc_diag_conninfo { · 83 unmodified lines
84	84	/* SMC_DIAG_LINKINFO */
85	85
86	86	struct smc_diag_linkinfo {
87		− __u8 link_id; /* link identifier */
88		− __u8 ibname[IB_DEVICE_NAME_MAX]; /* name of the RDMA device */
89		− __u8 ibport; /* RDMA device port number */
90		− __u8 gid[40]; /* local GID */
91		− __u8 peer_gid[40]; /* peer GID */
92		− __aligned_u64 net_cookie; /* RDMA device net namespace */
	87	+ __u8 link_id; /* link identifier */
	88	+ __u8 ibname[IB_DEVICE_NAME_MAX]; /* name of the RDMA device */
	89	+ __u8 ibport; /* RDMA device port number */
	90	+ __u8 gid[40]; /* local GID */
	91	+ __u8 peer_gid[40]; /* peer GID */
93	92	};
94	93
95	94	struct smc_diag_lgrinfo {

include/uapi/sound/asound.h+3−1

@@ -56,8 +56,10 @@ · 55 unmodified lines
56	56	* *
57	57	****************************************************************************/
58	58
	59	+#define AES_IEC958_STATUS_SIZE 24
	60	+
59	61	struct snd_aes_iec958 {
60		− unsigned char status[24]; /* AES/IEC958 channel status bits */
	62	+ unsigned char status[AES_IEC958_STATUS_SIZE]; /* AES/IEC958 channel status bits */
61	63	unsigned char subcode[147]; /* AES/IEC958 subcode bits */
62	64	unsigned char pad; /* nothing */
63	65	unsigned char dig_subframe[4]; /* AES/IEC958 subframe bits */

include/uapi/xen/gntdev.h+7−1

@@ -47,7 +47,13 @@ struct ioctl_gntdev_grant_ref { · 46 unmodified lines
47	47	/*
48	48	* Inserts the grant references into the mapping table of an instance
49	49	* of gntdev. N.B. This does not perform the mapping, which is deferred
50		− * until mmap() is called with @index as the offset.
	50	+ * until mmap() is called with @index as the offset. @index should be
	51	+ * considered opaque to userspace, with one exception: if no grant
	52	+ * references have ever been inserted into the mapping table of this
	53	+ * instance, @index will be set to 0. This is necessary to use gntdev
	54	+ * with userspace APIs that expect a file descriptor that can be
	55	+ * mmap()'d at offset 0, such as Wayland. If @count is set to 0, this
	56	+ * ioctl will fail.
51	57	*/
52	58	#define IOCTL_GNTDEV_MAP_GRANT_REF \
53	59	_IOC(_IOC_NONE, 'G', 0, sizeof(struct ioctl_gntdev_map_grant_ref))