Merge tag 'io_uring-6.5-2023-08-11' of git://git.kernel.dk/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Aug 2023 19:06:51 +0000 (12:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Aug 2023 19:06:51 +0000 (12:06 -0700)
commit2e40ed24e1696e47e94e804d09ef88ecb6617201
tree0bfaad67ce53882dedabd881cc07c35b7af301fe
parent9106536c1aa37bcf60202ad93bb8b94bcd29f3f0
parent56675f8b9f9b15b024b8e3145fa289b004916ab7
Merge tag 'io_uring-6.5-2023-08-11' of git://git.kernel.dk/linux

Pull io_uring fixes from Jens Axboe:
 "A followup fix for the parisc/SHM_COLOUR fix, also from Helge, which
  is heading to stable.

  And then just the io_uring equivalent of the RESOLVE_CACHED fix in
  commit a0fc452a5d7f from last week for build_open_flags()"

* tag 'io_uring-6.5-2023-08-11' of git://git.kernel.dk/linux:
  io_uring/parisc: Adjust pgoff in io_uring mmap() for parisc
  io_uring: correct check for O_TMPFILE