diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-04-09 07:50:14 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-04-09 07:50:14 +0300 |
commit | 4d6f9f2475f6f288b8b144bc263636c0b09cb4ef (patch) | |
tree | 8cef8dc0255fa036da7879585f2f8c336a268a4b /fs/lockd | |
parent | f335af10482a41ad5d28b4a2b0bee3ea35f771ce (diff) | |
parent | e677edbcabee849bfdd43f1602bccbecf736a646 (diff) | |
download | linux-4d6f9f2475f6f288b8b144bc263636c0b09cb4ef.tar.xz |
Merge tag 'io_uring-5.18-2022-04-08' of git://git.kernel.dk/linux-block
Pull io_uring fixes from Jens Axboe:
"A bit bigger than usual post merge window, largely due to a revert and
a fix of at what point files are assigned for requests.
The latter fixing a linked request use case where a dependent link can
rely on what file is assigned consistently.
Summary:
- 32-bit compat fix for IORING_REGISTER_IOWQ_AFF (Eugene)
- File assignment fixes (me)
- Revert of the NAPI poll addition from this merge window. The author
isn't available right now to engage on this, so let's revert it and
we can retry for the 5.19 release (me, Jakub)
- Fix a timeout removal race (me)
- File update and SCM fixes (Pavel)"
* tag 'io_uring-5.18-2022-04-08' of git://git.kernel.dk/linux-block:
io_uring: fix race between timeout flush and removal
io_uring: use nospec annotation for more indexes
io_uring: zero tag on rsrc removal
io_uring: don't touch scm_fp_list after queueing skb
io_uring: nospec index for tags on files update
io_uring: implement compat handling for IORING_REGISTER_IOWQ_AFF
Revert "io_uring: Add support for napi_busy_poll"
io_uring: drop the old style inflight file tracking
io_uring: defer file assignment
io_uring: propagate issue_flags state down to file assignment
io_uring: move read/write file prep state into actual opcode handler
io_uring: defer splice/tee file validity check until command issue
io_uring: don't check req->file in io_fsync_prep()
Diffstat (limited to 'fs/lockd')
0 files changed, 0 insertions, 0 deletions