From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 29 Jan 2022 12:53:07 +0000 (+0200)
Subject: Merge tag 'io_uring-5.17-2022-01-28' of git://git.kernel.dk/linux-block
X-Git-Tag: v5.17-rc2~12
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3b58e9f3a301e175d2de6f7fa1e834c4605e1c73;p=users%2Fdwmw2%2Flinux.git

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

Pull io_uring fixes from Jens Axboe:
 "Just two small fixes this time:

   - Fix a bug that can lead to node registration taking 1 second, when
     it should finish much quicker (Dylan)

   - Remove an unused argument from a function (Usama)"

* tag 'io_uring-5.17-2022-01-28' of git://git.kernel.dk/linux-block:
  io_uring: remove unused argument from io_rsrc_node_alloc
  io_uring: fix bug in slow unregistering of nodes
---

3b58e9f3a301e175d2de6f7fa1e834c4605e1c73