From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Nov 2021 19:11:37 +0000 (-0800)
Subject: Merge tag 'io_uring-5.16-2021-11-09' of git://git.kernel.dk/linux-block
X-Git-Tag: v6.1-rc5~2685
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=007301c472efd5c86e69e883dd889c555f131ab5;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'io_uring-5.16-2021-11-09' of git://git.kernel.dk/linux-block

Pull io_uring fixes from Jens Axboe:
 "Minor fixes that should go into the 5.16 release:

   - Fix max worker setting not working correctly on NUMA (Beld)

   - Correctly return current setting for max workers if zeroes are
     passed in (Pavel)

   - io_queue_sqe_arm_apoll() cleanup, as identified during the initial
     merge (Pavel)

   - Misc fixes (Nghia, me)"

* tag 'io_uring-5.16-2021-11-09' of git://git.kernel.dk/linux-block:
  io_uring: honour zeroes as io-wq worker limits
  io_uring: remove dead 'sqe' store
  io_uring: remove redundant assignment to ret in io_register_iowq_max_workers()
  io-wq: fix max-workers not correctly set on multi-node system
  io_uring: clean up io_queue_sqe_arm_apoll
---

007301c472efd5c86e69e883dd889c555f131ab5