diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-12 10:19:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-12 10:19:36 -0700 |
| commit | c7adbe2eb7639c9408599dd9762ba2fa3b87297c (patch) | |
| tree | ed25bd30de0e1e5aa579c5a0125a65d19502f3e2 /include | |
| parent | 90d3eaaf4f401b334aa5d156f843df3a3e7b30a0 (diff) | |
| parent | ff81dade48608363136d52bb2493a6df76458b28 (diff) | |
| download | linux-c7adbe2eb7639c9408599dd9762ba2fa3b87297c.tar.gz | |
Merge tag 'io_uring-6.9-20240412' of git://git.kernel.dk/linux
Pull io_uring fixes from Jens Axboe:
- Fix for sigmask restoring while waiting for events (Alexey)
- Typo fix in comment (Haiyue)
- Fix for a msg_control retstore on SEND_ZC retries (Pavel)
* tag 'io_uring-6.9-20240412' of git://git.kernel.dk/linux:
io-uring: correct typo in comment for IOU_F_TWQ_LAZY_WAKE
io_uring/net: restore msg_control on sendzc retry
io_uring: Fix io_cqring_wait() not restoring sigmask on get_timespec64() failure
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/io_uring_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/io_uring_types.h b/include/linux/io_uring_types.h index 05df0e399d7c0..ac333ea81d319 100644 --- a/include/linux/io_uring_types.h +++ b/include/linux/io_uring_types.h @@ -13,7 +13,7 @@ enum { * A hint to not wake right away but delay until there are enough of * tw's queued to match the number of CQEs the task is waiting for. * - * Must not be used wirh requests generating more than one CQE. + * Must not be used with requests generating more than one CQE. * It's also ignored unless IORING_SETUP_DEFER_TASKRUN is set. */ IOU_F_TWQ_LAZY_WAKE = 1, |