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

Daniel asked for this for some intel deps, so let's do it now.

Dave Airlie committed 4 years ago

Commit b9c7bab2 parents 123db17 754e0b0618 files · +6727 −3326Browse files

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

Unified · Split

6 files

@@ -1624,9 +1624,6 @@ struct kvm_enc_region { · 1623 unmodified lines
1624	1624	#define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3)
1625	1625	#define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4)
1626	1626
1627		−/* Available with KVM_CAP_XSAVE2 */
1628		−#define KVM_GET_XSAVE2 _IOR(KVMIO, 0xcf, struct kvm_xsave)
1629		−
1630	1627	struct kvm_s390_pv_sec_parm {
1631	1628	__u64 origin;
1632	1629	__u64 length;
@@ -2048,4 +2045,7 @@ struct kvm_stats_desc { · 415 unmodified lines
2048	2045
2049	2046	#define KVM_GET_STATS_FD _IO(KVMIO, 0xce)
2050	2047
	2048	+/* Available with KVM_CAP_XSAVE2 */
	2049	+#define KVM_GET_XSAVE2 _IOR(KVMIO, 0xcf, struct kvm_xsave)
	2050	+
2051	2051	#endif /* __LINUX_KVM_H */

@@ -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

@@ -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	};

@@ -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 {

@@ -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 */

@@ -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))