From: Linus Torvalds Date: Fri, 14 Jun 2024 18:17:24 +0000 (-0700) Subject: Merge tag 'io_uring-6.10-20240614' of git://git.kernel.dk/linux X-Git-Tag: v6.10-rc4~20 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ac3cb72aea010510eaa1e19ab001a0d28c6eb4ab;p=linux-block.git Merge tag 'io_uring-6.10-20240614' of git://git.kernel.dk/linux Pull io_uring fixes from Jens Axboe: "Two fixes from Pavel headed to stable: - Ensure that the task state is correct before attempting to grab a mutex - Split cancel sequence flag into a separate variable, as it can get set by someone not owning the request (but holding the ctx lock)" * tag 'io_uring-6.10-20240614' of git://git.kernel.dk/linux: io_uring: fix cancellation overwriting req->flags io_uring/rsrc: don't lock while !TASK_RUNNING --- ac3cb72aea010510eaa1e19ab001a0d28c6eb4ab