History

Merge tag 'io_uring-6.18-20251009' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux

Pull io_uring fixes from Jens Axboe: - Fixup indentation in the UAPI header - Two fixes for zcrx. One fixes receiving too much in some cases, and the other deals with not correctly incrementing the source in the fallback copy loop - Fix for a race in the IORING_OP_WAITID command, where there was a small window where the request would be left on the wait_queue_head list even though it was being canceled/completed - Update liburing git URL in the kernel tree * tag 'io_uring-6.18-20251009' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux: io_uring/zcrx: increment fallback loop src offset io_uring/zcrx: fix overshooting recv limit io_uring: use tab indentation for IORING_SEND_VECTORIZED comment io_uring/waitid: always prune wait queue entry in io_waitid_wait() io_uring: update liburing git URL

Linus Torvalds committed 1 year ago

Commit eba41c02 parents 8cc8ea2 e9a9dcb4 files · +9 −3Browse files

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

Unified · Split

include/uapi/linux/io_uring.h+1−1
@@ -404,7 +404,7 @@ enum io_uring_op { · 403 unmodified lines
404 * will be contiguous from the starting buffer ID.404 * will be contiguous from the starting buffer ID.
405 *405 *
406 * IORING_SEND_VECTORIZED If set, SEND[_ZC] will take a pointer to a io_vec406 * IORING_SEND_VECTORIZED If set, SEND[_ZC] will take a pointer to a io_vec
407 * to allow vectorized send operations.407 * to allow vectorized send operations.
408 */408 */
409#define IORING_RECVSEND_POLL_FIRST (1U << 0)409#define IORING_RECVSEND_POLL_FIRST (1U << 0)
410#define IORING_RECV_MULTISHOT (1U << 1)410#define IORING_RECV_MULTISHOT (1U << 1)