From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Nov 2023 22:03:18 +0000 (-0800)
Subject: Merge tag 'io_uring-6.7-2023-11-17' of git://git.kernel.dk/linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0e413c2a737f4ce8924645ee80438c3be7c44ee3;p=linux.git

Merge tag 'io_uring-6.7-2023-11-17' of git://git.kernel.dk/linux

Pull io_uring fix from Jens Axboe:
 "Just a single fixup for a change we made in this release, which caused
  a regression in sometimes missing fdinfo output if the SQPOLL thread
  had the lock held when fdinfo output was retrieved.

  This brings us back on par with what we had before, where just the
  main uring_lock will prevent that output. We'd love to get rid of that
  too, but that is beyond the scope of this release and will have to
  wait for 6.8"

* tag 'io_uring-6.7-2023-11-17' of git://git.kernel.dk/linux:
  io_uring/fdinfo: remove need for sqpoll lock for thread/pid retrieval
---

0e413c2a737f4ce8924645ee80438c3be7c44ee3