| Message ID | b9bc8682-1d86-ad68-68da-8b6b275e756b@kernel.dk (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [GIT,PULL] Followup io_uring pull for 6.1-rc2 | expand |
The pull request you sent on Sat, 22 Oct 2022 10:32:00 -0600:
> git://git.kernel.dk/linux.git tags/io_uring-6.1-2022-10-22
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/942e01ab90151a16b79b5c0cb8e77530d1ee3dbb
Thank you!
Hi Linus, Was going to delay this one for the potential batch next week, but turns out it's more convenient for the networking side to get this into -rc2 as it'll conflict with a patch going into net-next also adding a socket bit. Jakub has signed off on the net change. Currently the zero-copy has automatic fallback to normal transmit, and it was decided that it'd be cleaner to return an error instead if the socket type doesn't support it. It does work with UDP and TCP, it's more of a future proofing kind of thing (eg for samba). Please pull! The following changes since commit 996d3efeb091c503afd3ee6b5e20eabf446fd955: io-wq: Fix memory leak in worker creation (2022-10-20 05:48:59 -0700) are available in the Git repository at: git://git.kernel.dk/linux.git tags/io_uring-6.1-2022-10-22 for you to fetch changes up to cc767e7c6913f770741d9fad1efa4957c2623744: io_uring/net: fail zc sendmsg when unsupported by socket (2022-10-22 08:43:03 -0600) ---------------------------------------------------------------- io_uring-6.1-2022-10-22 ---------------------------------------------------------------- Pavel Begunkov (3): net: flag sockets supporting msghdr originated zerocopy io_uring/net: fail zc send when unsupported by socket io_uring/net: fail zc sendmsg when unsupported by socket include/linux/net.h | 1 + io_uring/net.c | 4 ++++ net/ipv4/tcp.c | 1 + net/ipv4/udp.c | 1 + 4 files changed, 7 insertions(+)