From: Linus Torvalds Date: Fri, 29 Jan 2021 21:47:47 +0000 (-0800) Subject: Merge tag 'io_uring-5.11-2021-01-29' of git://git.kernel.dk/linux-block X-Git-Tag: howlett/maple/20220722_2~3908 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c0ec4ffc40939e9a5a5844ce455f2b5b66a005fd;p=users%2Fjedix%2Flinux-maple.git Merge tag 'io_uring-5.11-2021-01-29' of git://git.kernel.dk/linux-block Pull io_uring fixes from Jens Axboe: "We got the cancelation story sorted now, so for all intents and purposes, this should be it for 5.11 outside of any potential little fixes that may come in. This contains: - task_work task state fixes (Hao, Pavel) - Cancelation fixes (me, Pavel) - Fix for an inflight req patch in this release (Pavel) - Fix for a lock deadlock issue (Pavel)" * tag 'io_uring-5.11-2021-01-29' of git://git.kernel.dk/linux-block: io_uring: reinforce cancel on flush during exit io_uring: fix sqo ownership false positive warning io_uring: fix list corruption for splice file_get io_uring: fix flush cqring overflow list while TASK_INTERRUPTIBLE io_uring: fix wqe->lock/completion_lock deadlock io_uring: fix cancellation taking mutex while TASK_UNINTERRUPTIBLE io_uring: fix __io_uring_files_cancel() with TASK_UNINTERRUPTIBLE io_uring: only call io_cqring_ev_posted() if events were posted io_uring: if we see flush on exit, cancel related tasks --- c0ec4ffc40939e9a5a5844ce455f2b5b66a005fd