From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 23 Oct 2022 16:55:50 +0000 (-0700)
Subject: Merge tag 'io_uring-6.1-2022-10-22' of git://git.kernel.dk/linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=942e01ab90151a16b79b5c0cb8e77530d1ee3dbb;p=linux.git

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
---

942e01ab90151a16b79b5c0cb8e77530d1ee3dbb