We want the staging driver fixes in here, and this resolves merge issues with the isdn code that was pointed out in linux-next
Showing the changes to include/uapi/linux (1 of 421 files). Show all
Unified · Split
| @@ -48,6 +48,7 @@ struct io_uring_sqe { · 47 unmodified lines | |||
| 48 | #define IOSQE_FIXED_FILE (1U << 0) /* use fixed fileset */ | 48 | #define IOSQE_FIXED_FILE (1U << 0) /* use fixed fileset */ |
| 49 | #define IOSQE_IO_DRAIN (1U << 1) /* issue after inflight IO */ | 49 | #define IOSQE_IO_DRAIN (1U << 1) /* issue after inflight IO */ |
| 50 | #define IOSQE_IO_LINK (1U << 2) /* links next sqe */ | 50 | #define IOSQE_IO_LINK (1U << 2) /* links next sqe */ |
| 51 | #define IOSQE_IO_HARDLINK (1U << 3) /* like LINK, but stronger */ | ||
| 51 | 52 | ||
| 52 | /* | 53 | /* |
| 53 | * io_uring_setup() flags | 54 | * io_uring_setup() flags |
| @@ -57,23 +58,28 @@ struct io_uring_sqe { · 3 unmodified lines | |||
| 57 | #define IORING_SETUP_SQ_AFF (1U << 2) /* sq_thread_cpu is valid */ | 58 | #define IORING_SETUP_SQ_AFF (1U << 2) /* sq_thread_cpu is valid */ |
| 58 | #define IORING_SETUP_CQSIZE (1U << 3) /* app defines CQ size */ | 59 | #define IORING_SETUP_CQSIZE (1U << 3) /* app defines CQ size */ |
| 59 | 60 | ||
| 60 | #define IORING_OP_NOP 0 | 61 | enum { |
| 61 | #define IORING_OP_READV 1 | 62 | IORING_OP_NOP, |
| 62 | #define IORING_OP_WRITEV 2 | 63 | IORING_OP_READV, |
| 63 | #define IORING_OP_FSYNC 3 | 64 | IORING_OP_WRITEV, |
| 64 | #define IORING_OP_READ_FIXED 4 | 65 | IORING_OP_FSYNC, |
| 65 | #define IORING_OP_WRITE_FIXED 5 | 66 | IORING_OP_READ_FIXED, |
| 66 | #define IORING_OP_POLL_ADD 6 | 67 | IORING_OP_WRITE_FIXED, |
| 67 | #define IORING_OP_POLL_REMOVE 7 | 68 | IORING_OP_POLL_ADD, |
| 68 | #define IORING_OP_SYNC_FILE_RANGE 8 | 69 | IORING_OP_POLL_REMOVE, |
| 69 | #define IORING_OP_SENDMSG 9 | 70 | IORING_OP_SYNC_FILE_RANGE, |
| 70 | #define IORING_OP_RECVMSG 10 | 71 | IORING_OP_SENDMSG, |
| 71 | #define IORING_OP_TIMEOUT 11 | 72 | IORING_OP_RECVMSG, |
| 72 | #define IORING_OP_TIMEOUT_REMOVE 12 | 73 | IORING_OP_TIMEOUT, |
| 73 | #define IORING_OP_ACCEPT 13 | 74 | IORING_OP_TIMEOUT_REMOVE, |
| 74 | #define IORING_OP_ASYNC_CANCEL 14 | 75 | IORING_OP_ACCEPT, |
| 75 | #define IORING_OP_LINK_TIMEOUT 15 | 76 | IORING_OP_ASYNC_CANCEL, |
| 76 | #define IORING_OP_CONNECT 16 | 77 | IORING_OP_LINK_TIMEOUT, |
| 78 | IORING_OP_CONNECT, | ||
| 79 | |||
| 80 | /* this goes last, obviously */ | ||
| 81 | IORING_OP_LAST, | ||
| 82 | }; | ||
| 77 | 83 | ||
| 78 | /* | 84 | /* |
| 79 | * sqe->fsync_flags | 85 | * sqe->fsync_flags |