BackMerge tag 'v5.15-rc7' into drm-next

The msm next tree is based on rc3, so let's just backmerge rc7 before pulling it in.

Dave Airlie committed 5 years ago

Commit 970eae12 parents 27f4432 3906fe91437 files · +16472 −9320Browse files

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

Unified · Split

7 files

@@ -225,7 +225,14 @@ struct binder_freeze_info { · 224 unmodified lines
225	225
226	226	struct binder_frozen_status_info {
227	227	__u32 pid;
	228	+
	229	+ /* process received sync transactions since last frozen
	230	+ * bit 0: received sync transaction after being frozen
	231	+ * bit 1: new pending sync transaction during freezing
	232	+ */
228	233	__u32 sync_recv;
	234	+
	235	+ /* process received async transactions since last frozen */
229	236	__u32 async_recv;
230	237	};
231	238

@@ -1,6 +1,5 @@
1	1	/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
2	2	/*
3		− * include/uapi/linux/cifs/cifs_mount.h
4	3	*
5	4	* Author(s): Scott Lovenberg (scott.lovenberg@gmail.com)
6	5	*

@@ -26,7 +26,7 @@ · 25 unmodified lines
26	26	#ifndef _UAPI_HYPERV_H
27	27	#define _UAPI_HYPERV_H
28	28
29		−#include <linux/uuid.h>
	29	+#include <linux/types.h>
30	30
31	31	/*
32	32	* Framework version for util services.

@@ -10,6 +10,7 @@ · 9 unmodified lines
10	10	#define __UAPI_MCTP_H
11	11
12	12	#include <linux/types.h>
	13	+#include <linux/socket.h>
13	14
14	15	typedef __u8 mctp_eid_t;
15	16
@@ -18,11 +19,13 @@ struct mctp_addr { · 2 unmodified lines
18	19	};
19	20
20	21	struct sockaddr_mctp {
21		− unsigned short int smctp_family;
22		− int smctp_network;
	22	+ __kernel_sa_family_t smctp_family;
	23	+ __u16 __smctp_pad0;
	24	+ unsigned int smctp_network;
23	25	struct mctp_addr smctp_addr;
24	26	__u8 smctp_type;
25	27	__u8 smctp_tag;
	28	+ __u8 __smctp_pad1;
26	29	};
27	30
28	31	#define MCTP_NET_ANY 0x0

@@ -213,13 +213,13 @@ enum { · 212 unmodified lines
213	213	XFRM_MSG_GETSPDINFO,
214	214	#define XFRM_MSG_GETSPDINFO XFRM_MSG_GETSPDINFO
215	215
	216	+ XFRM_MSG_MAPPING,
	217	+#define XFRM_MSG_MAPPING XFRM_MSG_MAPPING
	218	+
216	219	XFRM_MSG_SETDEFAULT,
217	220	#define XFRM_MSG_SETDEFAULT XFRM_MSG_SETDEFAULT
218	221	XFRM_MSG_GETDEFAULT,
219	222	#define XFRM_MSG_GETDEFAULT XFRM_MSG_GETDEFAULT
220		−
221		− XFRM_MSG_MAPPING,
222		−#define XFRM_MSG_MAPPING XFRM_MSG_MAPPING
223	223	__XFRM_MSG_MAX
224	224	};
225	225	#define XFRM_MSG_MAX (__XFRM_MSG_MAX - 1)
@@ -514,9 +514,12 @@ struct xfrm_user_offload { · 288 unmodified lines
514	514	#define XFRM_OFFLOAD_INBOUND 2
515	515
516	516	struct xfrm_userpolicy_default {
517		−#define XFRM_USERPOLICY_DIRMASK_MAX (sizeof(__u8) * 8)
518		− __u8 dirmask;
519		− __u8 action;
	517	+#define XFRM_USERPOLICY_UNSPEC 0
	518	+#define XFRM_USERPOLICY_BLOCK 1
	519	+#define XFRM_USERPOLICY_ACCEPT 2
	520	+ __u8 in;
	521	+ __u8 fwd;
	522	+ __u8 out;
520	523	};
521	524
522	525	#ifndef __KERNEL__

@@ -917,7 +917,6 @@ struct hl_wait_cs_in { · 916 unmodified lines
917	917	#define HL_WAIT_CS_STATUS_BUSY 1
918	918	#define HL_WAIT_CS_STATUS_TIMEDOUT 2
919	919	#define HL_WAIT_CS_STATUS_ABORTED 3
920		−#define HL_WAIT_CS_STATUS_INTERRUPTED 4
921	920
922	921	#define HL_WAIT_CS_STATUS_FLAG_GONE 0x1
923	922	#define HL_WAIT_CS_STATUS_FLAG_TIMESTAMP_VLD 0x2
@@ -1286,7 +1285,8 @@ struct hl_debug_args { · 362 unmodified lines
1286	1285	* EIO - The CS was aborted (usually because the device was reset)
1287	1286	* ENODEV - The device wants to do hard-reset (so user need to close FD)
1288	1287	*
1289		− * The driver also returns a custom define inside the IOCTL which can be:
	1288	+ * The driver also returns a custom define in case the IOCTL call returned 0.
	1289	+ * The define can be one of the following:
1290	1290	*
1291	1291	* HL_WAIT_CS_STATUS_COMPLETED - The CS has been completed successfully (0)
1292	1292	* HL_WAIT_CS_STATUS_BUSY - The CS is still executing (0)
@@ -1294,8 +1294,6 @@ struct hl_debug_args { · 1 unmodified line
1294	1294	* (ETIMEDOUT)
1295	1295	* HL_WAIT_CS_STATUS_ABORTED - The CS was aborted, usually because the
1296	1296	* device was reset (EIO)
1297		− * HL_WAIT_CS_STATUS_INTERRUPTED - Waiting for the CS was interrupted (EINTR)
1298		− *
1299	1297	*/
1300	1298
1301	1299	#define HL_IOCTL_WAIT_CS \

@@ -784,6 +784,7 @@ struct snd_rawmidi_status { · 783 unmodified lines
784	784
785	785	#define SNDRV_RAWMIDI_IOCTL_PVERSION _IOR('W', 0x00, int)
786	786	#define SNDRV_RAWMIDI_IOCTL_INFO _IOR('W', 0x01, struct snd_rawmidi_info)
	787	+#define SNDRV_RAWMIDI_IOCTL_USER_PVERSION _IOW('W', 0x02, int)
787	788	#define SNDRV_RAWMIDI_IOCTL_PARAMS _IOWR('W', 0x10, struct snd_rawmidi_params)
788	789	#define SNDRV_RAWMIDI_IOCTL_STATUS _IOWR('W', 0x20, struct snd_rawmidi_status)
789	790	#define SNDRV_RAWMIDI_IOCTL_DROP _IOW('W', 0x30, int)