From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Aug 2023 19:06:51 +0000 (-0700)
Subject: Merge tag 'io_uring-6.5-2023-08-11' of git://git.kernel.dk/linux
X-Git-Tag: v6.5-rc6~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e40ed24e1696e47e94e804d09ef88ecb6617201;p=thirdparty%2Flinux.git

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

2e40ed24e1696e47e94e804d09ef88ecb6617201