From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Feb 2022 19:08:15 +0000 (-0800)
Subject: Merge tag 'io_uring-5.17-2022-02-23' of git://git.kernel.dk/linux-block
X-Git-Tag: v5.17-rc6~31
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3a5f59b17f9dec448976626663a73841460d7ab4;p=people%2Fjgross%2Flinux.git

Merge tag 'io_uring-5.17-2022-02-23' of git://git.kernel.dk/linux-block

Pull io_uring fixes from Jens Axboe:

 - Add a conditional schedule point in io_add_buffers() (Eric)

 - Fix for a quiesce speedup merged in this release (Dylan)

 - Don't convert to jiffies for event timeout waiting, it's way too
   coarse when we accept a timespec as input (me)

* tag 'io_uring-5.17-2022-02-23' of git://git.kernel.dk/linux-block:
  io_uring: disallow modification of rsrc_data during quiesce
  io_uring: don't convert to jiffies for waiting on timeouts
  io_uring: add a schedule point in io_add_buffers()
---

3a5f59b17f9dec448976626663a73841460d7ab4