Merge tag 'io_uring-6.1-2022-10-22' of git://git.kernel.dk/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Oct 2022 16:55:50 +0000 (09:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Oct 2022 16:55:50 +0000 (09:55 -0700)
commit942e01ab90151a16b79b5c0cb8e77530d1ee3dbb
treed703a4ca1471314aff9aa3092c2681099f8dfe3d
parentd47136c2801540e80f41ec7e063d8d592568ad76
parentcc767e7c6913f770741d9fad1efa4957c2623744
Merge tag 'io_uring-6.1-2022-10-22' of git://git.kernel.dk/linux

Pull io_uring follow-up from Jens Axboe:
 "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.

  Zero-copy does work with UDP and TCP, it's more of a future proofing
  kind of thing (eg for samba)"

* tag 'io_uring-6.1-2022-10-22' of git://git.kernel.dk/linux:
  io_uring/net: fail zc sendmsg when unsupported by socket
  io_uring/net: fail zc send when unsupported by socket
  net: flag sockets supporting msghdr originated zerocopy
net/ipv4/udp.c