Pull io_uring fixes from Jens Axboe: - Fix a comment in the uapi header using the wrong member name (Caleb) - Fix KCSAN warning for a debug check in sqpoll (me) - Two more NAPI tweaks (Olivier) * tag 'io_uring-6.11-20240824' of git://git.kernel.dk/linux: io_uring: fix user_data field name in comment io_uring/sqpoll: annotate debug task == current with data_race() io_uring/napi: remove duplicate io_napi_entry timeout assignation io_uring/napi: check napi_enabled in io_napi_add() before proceeding
Showing the changes to include/uapi/linux (1 of 4 files). Show all
Unified · Split
| @@ -421,7 +421,7 @@ enum io_uring_msg_ring_flags { · 420 unmodified lines | |||
| 421 | * IO completion data structure (Completion Queue Entry) | 421 | * IO completion data structure (Completion Queue Entry) |
| 422 | */ | 422 | */ |
| 423 | struct io_uring_cqe { | 423 | struct io_uring_cqe { |
| 424 | __u64 user_data; /* sqe->data submission passed back */ | 424 | __u64 user_data; /* sqe->user_data value passed back */ |
| 425 | __s32 res; /* result code for this event */ | 425 | __s32 res; /* result code for this event */ |
| 426 | __u32 flags; | 426 | __u32 flags; |
| 427 | 427 | ||