diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-19 03:21:30 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-19 03:21:30 +0300 |
commit | 01464a73a6387b45aa4cf6ea522abd4f9e44dce5 (patch) | |
tree | 0dc47c3cda87f9759fd544d17fd62a585db8d936 /net/mptcp/pm.c | |
parent | 8194a0089207e8fff75a4dee2b98b0a537be2c54 (diff) | |
parent | aa184e8671f0f911fc2fb3f68cd506e4d7838faa (diff) | |
download | linux-01464a73a6387b45aa4cf6ea522abd4f9e44dce5.tar.xz |
Merge tag 'io_uring-5.18-2022-05-18' of git://git.kernel.dk/linux-block
Pull io_uring fixes from Jens Axboe:
"Two small changes fixing issues from the 5.18 merge window:
- Fix wrong ordering of a tracepoint (Dylan)
- Fix MSG_RING on IOPOLL rings (me)"
* tag 'io_uring-5.18-2022-05-18' of git://git.kernel.dk/linux-block:
io_uring: don't attempt to IOPOLL for MSG_RING requests
io_uring: fix ordering of args in io_uring_queue_async_work
Diffstat (limited to 'net/mptcp/pm.c')
0 files changed, 0 insertions, 0 deletions