From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Jan 2022 14:07:21 +0000 (+0200)
Subject: Merge tag 'io_uring-5.17-2022-01-21' of git://git.kernel.dk/linux-block
X-Git-Tag: v6.6.17~8343
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f3a78227eef20c0ba13bbf9401f0a340bca3ad16;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull io_uring fixes from Jens Axboe:

 - Fix the io_uring POLLFREE handling, similarly to how it was done for
   aio (Pavel)

 - Remove (now) unused function (Jiapeng)

 - Small series fixing an issue with work cancelations. A window exists
   where work isn't locatable in the pending list, and isn't active in a
   worker yet either. (me)

* tag 'io_uring-5.17-2022-01-21' of git://git.kernel.dk/linux-block:
  io-wq: delete dead lock shuffling code
  io_uring: perform poll removal even if async work removal is successful
  io-wq: add intermediate work step between pending list and active work
  io-wq: perform both unstarted and started work cancelations in one go
  io-wq: invoke work cancelation with wqe->lock held
  io-wq: make io_worker lock a raw spinlock
  io-wq: remove useless 'work' argument to __io_worker_busy()
  io_uring: fix UAF due to missing POLLFREE handling
  io_uring: Remove unused function req_ref_put
---

f3a78227eef20c0ba13bbf9401f0a340bca3ad16