History

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

Pull io_uring fixes from Jens Axboe: - Remove the sync refill API that was added in this release, in anticipation of doing it in a better way for the next release - Fix type extension for calculating size off nr_pages, like we do in other spots * tag 'io_uring-6.18-20251106' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux: io_uring: fix types for region size calulation io_uring/zcrx: remove sync refill uapi

Linus Torvalds committed 1 year ago

Commit 9dc52062 parents 11a6afa 1fd53675 files · +1 −91Browse files

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

Unified · Split

include/uapi/linux/io_uring.h+0−12
@@ -689,9 +689,6 @@ enum io_uring_register_op { · 688 unmodified lines
689689 /* query various aspects of io_uring, see linux/io_uring/query.h */
690690 IORING_REGISTER_QUERY = 35,
691691
692− /* return zcrx buffers back into circulation */
693− IORING_REGISTER_ZCRX_REFILL = 36,
694−
695692 /* this goes last */
696693 IORING_REGISTER_LAST,
697694
@@ -1073,15 +1070,6 @@ struct io_uring_zcrx_ifq_reg { · 375 unmodified lines
10731070 __u64 __resv[3];
10741071 };
10751072
1076−struct io_uring_zcrx_sync_refill {
1077− __u32 zcrx_id;
1078− /* the number of entries to return */
1079− __u32 nr_entries;
1080− /* pointer to an array of struct io_uring_zcrx_rqe */
1081− __u64 rqes;
1082− __u64 __resv[2];
1083−};
1084−
10851073 #ifdef __cplusplus
10861074 }
10871075 #endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t