From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Jul 2022 17:52:01 +0000 (-0700)
Subject: Merge tag 'io_uring-5.19-2022-07-01' of git://git.kernel.dk/linux-block
X-Git-Tag: microblaze-v6.1~380
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=0a35d1622d5cd7693d75b7124913c75a7e3fabd0;p=linux-2.6-microblaze.git

Merge tag 'io_uring-5.19-2022-07-01' of git://git.kernel.dk/linux-block

Pull io_uring fixes from Jens Axboe:
 "Two minor tweaks:

   - While we still can, adjust the send/recv based flags to be in
     ->ioprio rather than in ->addr2. This is consistent with eg accept,
     and also doesn't waste a full 64-bit field for flags (Pavel)

   - 5.18-stable fix for re-importing provided buffers. Not much real
     world relevance here as it'll only impact non-pollable files gone
     async, which is more of a practical test case rather than something
     that is used in the wild (Dylan)"

* tag 'io_uring-5.19-2022-07-01' of git://git.kernel.dk/linux-block:
  io_uring: fix provided buffer import
  io_uring: keep sendrecv flags in ioprio
---

0a35d1622d5cd7693d75b7124913c75a7e3fabd0