History

Merge branch 'for-6.15/io_uring-epoll-wait' into for-6.15/io_uring-reg-vec

* for-6.15/io_uring-epoll-wait: io_uring/epoll: add support for IORING_OP_EPOLL_WAIT io_uring/epoll: remove CONFIG_EPOLL guards eventpoll: add epoll_sendevents() helper eventpoll: abstract out ep_try_send_events() helper eventpoll: abstract out parameter sanity checking

Jens Axboe committed 1 year ago

Commit 6e3da402 parents 78b6f6e 19f7e947 files · +122 −30Browse files

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

Unified · Split

include/uapi/linux/io_uring.h+1−0
@@ -280,6 +280,7 @@ enum io_uring_op { · 279 unmodified lines
280 IORING_OP_BIND,280 IORING_OP_BIND,
281 IORING_OP_LISTEN,281 IORING_OP_LISTEN,
282 IORING_OP_RECV_ZC,282 IORING_OP_RECV_ZC,
283 IORING_OP_EPOLL_WAIT,
283 284
284 /* this goes last, obviously */285 /* this goes last, obviously */
285 IORING_OP_LAST,286 IORING_OP_LAST,