Merge 6.11-rc4 into usb-next

We need the usb / thunderbolt fixes in here as well.

Greg Kroah-Hartman committed 2 years ago

Commit ca7df2c2 parents 8231362 47ac09b432 files · +5005 −2832Browse files

Showing the changes to include/uapi (4 of 432 files). Show all

Unified · Split

4 files

@@ -421,7 +421,7 @@ enum io_uring_msg_ring_flags { · 420 unmodified lines
421	421	* IO completion data structure (Completion Queue Entry)
422	422	*/
423	423	struct io_uring_cqe {
424		− __u64 user_data; /* sqe->data submission passed back */
	424	+ __u64 user_data; /* sqe->user_data value passed back */
425	425	__s32 res; /* result code for this event */
426	426	__u32 flags;
427	427

@@ -3,6 +3,7 @@ · 2 unmodified lines
3	3	#define __LINUX_NSFS_H
4	4
5	5	#include <linux/ioctl.h>
	6	+#include <linux/types.h>
6	7
7	8	#define NSIO 0xb7
8	9
@@ -16,7 +17,7 @@ · 7 unmodified lines
16	17	/* Get owner UID (in the caller's user namespace) for a user namespace */
17	18	#define NS_GET_OWNER_UID _IO(NSIO, 0x4)
18	19	/* Get the id for a mount namespace */
19		−#define NS_GET_MNTNS_ID _IO(NSIO, 0x5)
	20	+#define NS_GET_MNTNS_ID _IOR(NSIO, 0x5, __u64)
20	21	/* Translate pid from target pid namespace into the caller's pid namespace. */
21	22	#define NS_GET_PID_FROM_PIDNS _IOR(NSIO, 0x6, int)
22	23	/* Return thread-group leader id of pid in the callers pid namespace. */

@@ -51,6 +51,7 @@ typedef enum { · 50 unmodified lines
51	51	SEV_RET_INVALID_PLATFORM_STATE,
52	52	SEV_RET_INVALID_GUEST_STATE,
53	53	SEV_RET_INAVLID_CONFIG,
	54	+ SEV_RET_INVALID_CONFIG = SEV_RET_INAVLID_CONFIG,
54	55	SEV_RET_INVALID_LEN,
55	56	SEV_RET_ALREADY_OWNED,
56	57	SEV_RET_INVALID_CERTIFICATE,

@@ -8,14 +8,11 @@ · 7 unmodified lines
8	8	#define FASTRPC_IOCTL_ALLOC_DMA_BUFF _IOWR('R', 1, struct fastrpc_alloc_dma_buf)
9	9	#define FASTRPC_IOCTL_FREE_DMA_BUFF _IOWR('R', 2, __u32)
10	10	#define FASTRPC_IOCTL_INVOKE _IOWR('R', 3, struct fastrpc_invoke)
11		−/* This ioctl is only supported with secure device nodes */
12	11	#define FASTRPC_IOCTL_INIT_ATTACH _IO('R', 4)
13	12	#define FASTRPC_IOCTL_INIT_CREATE _IOWR('R', 5, struct fastrpc_init_create)
14	13	#define FASTRPC_IOCTL_MMAP _IOWR('R', 6, struct fastrpc_req_mmap)
15	14	#define FASTRPC_IOCTL_MUNMAP _IOWR('R', 7, struct fastrpc_req_munmap)
16		−/* This ioctl is only supported with secure device nodes */
17	15	#define FASTRPC_IOCTL_INIT_ATTACH_SNS _IO('R', 8)
18		−/* This ioctl is only supported with secure device nodes */
19	16	#define FASTRPC_IOCTL_INIT_CREATE_STATIC _IOWR('R', 9, struct fastrpc_init_create_static)
20	17	#define FASTRPC_IOCTL_MEM_MAP _IOWR('R', 10, struct fastrpc_mem_map)
21	18	#define FASTRPC_IOCTL_MEM_UNMAP _IOWR('R', 11, struct fastrpc_mem_unmap)