From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Oct 2021 03:34:31 +0000 (-1000)
Subject: Merge tag 'io_uring-5.15-2021-10-22' of git://git.kernel.dk/linux-block
X-Git-Tag: accepted/tizen/unified/20230118.172025~6138
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=da4d34b669723508601a4c29daa22cdc669ee005;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'io_uring-5.15-2021-10-22' of git://git.kernel.dk/linux-block

Pull io_uring fixes from Jens Axboe:
 "Two fixes for the max workers limit API that was introduced this
  series: one fix for an issue with that code, and one fixing a linked
  timeout regression in this series"

* tag 'io_uring-5.15-2021-10-22' of git://git.kernel.dk/linux-block:
  io_uring: apply worker limits to previous users
  io_uring: fix ltimeout unprep
  io_uring: apply max_workers limit to all future users
  io-wq: max_worker fixes
---

da4d34b669723508601a4c29daa22cdc669ee005