diff options
| author | Jens Axboe <axboe@kernel.dk> | 2025-02-27 07:18:01 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2025-02-27 07:18:01 -0700 |
| commit | c0d8c0362ba56dd68b45293271e5829ed8c95f5a (patch) | |
| tree | a0ba4791921a273cc9d360b71845bbe71f3e0a7c /include/uapi | |
| parent | io_uring: combine buffer lookup and import (diff) | |
| parent | io_uring/net: save msg_control for compat (diff) | |
| download | linux-c0d8c0362ba56dd68b45293271e5829ed8c95f5a.tar.gz linux-c0d8c0362ba56dd68b45293271e5829ed8c95f5a.zip | |
Merge branch 'io_uring-6.14' into for-6.15/io_uring
Merge mainline fixes into 6.15 branch, as upcoming patches depend on
fixes that went into the 6.14 mainline branch.
* io_uring-6.14:
io_uring/net: save msg_control for compat
io_uring/rw: clean up mshot forced sync mode
io_uring/rw: move ki_complete init into prep
io_uring/rw: don't directly use ki_complete
io_uring/rw: forbid multishot async reads
io_uring/rsrc: remove unused constants
io_uring: fix spelling error in uapi io_uring.h
io_uring: prevent opcode speculation
io-wq: backoff when retrying worker creation
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/io_uring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index e11c82638527..050fa8eb2e8f 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -380,7 +380,7 @@ enum io_uring_op { * result will be the number of buffers send, with * the starting buffer ID in cqe->flags as per * usual for provided buffer usage. The buffers - * will be contigious from the starting buffer ID. + * will be contiguous from the starting buffer ID. */ #define IORING_RECVSEND_POLL_FIRST (1U << 0) #define IORING_RECV_MULTISHOT (1U << 1) |