History

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
  1. include/uapi/linux/io_uring.h +1 −1
  2. include/uapi/linux/nsfs.h +2 −1
  3. include/uapi/linux/psp-sev.h +1 −0
  4. include/uapi/misc/fastrpc.h +0 −3
include/uapi/linux/io_uring.h+1−1
@@ -421,7 +421,7 @@ enum io_uring_msg_ring_flags { · 420 unmodified lines
421 * IO completion data structure (Completion Queue Entry)421 * IO completion data structure (Completion Queue Entry)
422 */422 */
423struct io_uring_cqe {423struct io_uring_cqe {
424 __u64 user_data; /* sqe->data submission passed back */424 __u64 user_data; /* sqe->user_data value passed back */
425 __s32 res; /* result code for this event */425 __s32 res; /* result code for this event */
426 __u32 flags;426 __u32 flags;
427 427
include/uapi/linux/nsfs.h+2−1
@@ -3,6 +3,7 @@ · 2 unmodified lines
3#define __LINUX_NSFS_H3#define __LINUX_NSFS_H
4 4
5#include <linux/ioctl.h>5#include <linux/ioctl.h>
6#include <linux/types.h>
6 7
7#define NSIO 0xb78#define NSIO 0xb7
8 9
@@ -16,7 +17,7 @@ · 7 unmodified lines
16/* Get owner UID (in the caller's user namespace) for a user namespace */17/* Get owner UID (in the caller's user namespace) for a user namespace */
17#define NS_GET_OWNER_UID _IO(NSIO, 0x4)18#define NS_GET_OWNER_UID _IO(NSIO, 0x4)
18/* Get the id for a mount namespace */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/* Translate pid from target pid namespace into the caller's pid namespace. */21/* Translate pid from target pid namespace into the caller's pid namespace. */
21#define NS_GET_PID_FROM_PIDNS _IOR(NSIO, 0x6, int)22#define NS_GET_PID_FROM_PIDNS _IOR(NSIO, 0x6, int)
22/* Return thread-group leader id of pid in the callers pid namespace. */23/* Return thread-group leader id of pid in the callers pid namespace. */
include/uapi/linux/psp-sev.h+1−0
@@ -51,6 +51,7 @@ typedef enum { · 50 unmodified lines
51 SEV_RET_INVALID_PLATFORM_STATE,51 SEV_RET_INVALID_PLATFORM_STATE,
52 SEV_RET_INVALID_GUEST_STATE,52 SEV_RET_INVALID_GUEST_STATE,
53 SEV_RET_INAVLID_CONFIG,53 SEV_RET_INAVLID_CONFIG,
54 SEV_RET_INVALID_CONFIG = SEV_RET_INAVLID_CONFIG,
54 SEV_RET_INVALID_LEN,55 SEV_RET_INVALID_LEN,
55 SEV_RET_ALREADY_OWNED,56 SEV_RET_ALREADY_OWNED,
56 SEV_RET_INVALID_CERTIFICATE,57 SEV_RET_INVALID_CERTIFICATE,
include/uapi/misc/fastrpc.h+0−3
@@ -8,14 +8,11 @@ · 7 unmodified lines
8#define FASTRPC_IOCTL_ALLOC_DMA_BUFF _IOWR('R', 1, struct fastrpc_alloc_dma_buf)8#define FASTRPC_IOCTL_ALLOC_DMA_BUFF _IOWR('R', 1, struct fastrpc_alloc_dma_buf)
9#define FASTRPC_IOCTL_FREE_DMA_BUFF _IOWR('R', 2, __u32)9#define FASTRPC_IOCTL_FREE_DMA_BUFF _IOWR('R', 2, __u32)
10#define FASTRPC_IOCTL_INVOKE _IOWR('R', 3, struct fastrpc_invoke)10#define FASTRPC_IOCTL_INVOKE _IOWR('R', 3, struct fastrpc_invoke)
11/* This ioctl is only supported with secure device nodes */
12#define FASTRPC_IOCTL_INIT_ATTACH _IO('R', 4)11#define FASTRPC_IOCTL_INIT_ATTACH _IO('R', 4)
13#define FASTRPC_IOCTL_INIT_CREATE _IOWR('R', 5, struct fastrpc_init_create)12#define FASTRPC_IOCTL_INIT_CREATE _IOWR('R', 5, struct fastrpc_init_create)
14#define FASTRPC_IOCTL_MMAP _IOWR('R', 6, struct fastrpc_req_mmap)13#define FASTRPC_IOCTL_MMAP _IOWR('R', 6, struct fastrpc_req_mmap)
15#define FASTRPC_IOCTL_MUNMAP _IOWR('R', 7, struct fastrpc_req_munmap)14#define FASTRPC_IOCTL_MUNMAP _IOWR('R', 7, struct fastrpc_req_munmap)
16/* This ioctl is only supported with secure device nodes */
17#define FASTRPC_IOCTL_INIT_ATTACH_SNS _IO('R', 8)15#define FASTRPC_IOCTL_INIT_ATTACH_SNS _IO('R', 8)
18/* This ioctl is only supported with secure device nodes */
19#define FASTRPC_IOCTL_INIT_CREATE_STATIC _IOWR('R', 9, struct fastrpc_init_create_static)16#define FASTRPC_IOCTL_INIT_CREATE_STATIC _IOWR('R', 9, struct fastrpc_init_create_static)
20#define FASTRPC_IOCTL_MEM_MAP _IOWR('R', 10, struct fastrpc_mem_map)17#define FASTRPC_IOCTL_MEM_MAP _IOWR('R', 10, struct fastrpc_mem_map)
21#define FASTRPC_IOCTL_MEM_UNMAP _IOWR('R', 11, struct fastrpc_mem_unmap)18#define FASTRPC_IOCTL_MEM_UNMAP _IOWR('R', 11, struct fastrpc_mem_unmap)