diff options
| author | Jens Axboe <axboe@kernel.dk> | 2025-03-07 09:07:19 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2025-03-07 09:07:19 -0700 |
| commit | 6e3da40ed6f3508dcf34b1539496bcccef7015ef (patch) | |
| tree | 0eeb5608dc15f91a09bf0d88499572a05294eb4b /include/uapi/linux/io_uring.h | |
| parent | 78b6f6e9bf3960c5ee3368415a11babb754b9a19 (diff) | |
| parent | 19f7e942732766aec8a51d217ab5fb4a7fe3bb0d (diff) | |
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
Diffstat (limited to 'include/uapi/linux/io_uring.h')
| -rw-r--r-- | include/uapi/linux/io_uring.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 1e02e94bc26d..3d99bf9bbf61 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -280,6 +280,7 @@ enum io_uring_op { IORING_OP_BIND, IORING_OP_LISTEN, IORING_OP_RECV_ZC, + IORING_OP_EPOLL_WAIT, /* this goes last, obviously */ IORING_OP_LAST, |