From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Mar 2023 18:12:07 +0000 (-0700)
Subject: Merge tag 'io_uring-6.3-2023-03-16' of git://git.kernel.dk/linux
X-Git-Tag: v6.6.7~3272
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b7966a5a5cd009a682ccb0823e89f1e9fb719f27;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'io_uring-6.3-2023-03-16' of git://git.kernel.dk/linux

Pull io_uring fixes from Jens Axboe:

 - When PF_NO_SETAFFINITY was removed for io-wq threads, we kind of
   forgot about the SQPOLL thread. Remove it there as well, there's even
   less of a reason to set it there (Michal)

 - Fixup a confusing 'ret' setting (Li)

 - When MSG_RING is used to send a direct descriptor to another ring,
   it's possible to have it allocate it on the target ring rather than
   provide a specific index for it. If this is done, return the chosen
   value in the CQE, like we would've done locally (Pavel)

 - Fix a regression in this series on huge page bvec collapsing (Pavel)

* tag 'io_uring-6.3-2023-03-16' of git://git.kernel.dk/linux:
  io_uring/rsrc: fix folio accounting
  io_uring/msg_ring: let target know allocated index
  io_uring: rsrc: Optimize return value variable 'ret'
  io_uring/sqpoll: Do not set PF_NO_SETAFFINITY on sqpoll threads
---

b7966a5a5cd009a682ccb0823e89f1e9fb719f27