On Thu, Jul 15, 2021 at 09:27:53AM -0600, Jens Axboe wrote: > On 7/15/21 7:22 AM, Greg KH wrote: > > On Thu, Jul 15, 2021 at 09:18:25PM +0800, Yang Yingliang wrote: > >> In commit 3ebba796fa25 ("io_uring: ensure that SQPOLL thread is started for exit"), > >> the IORING_SETUP_R_DISABLED is cleared in io_sq_offload_start(), but when backport > >> it to stable-5.10, IORING_SETUP_R_DISABLED is cleared in __io_req_task_submit(), > >> move clearing IORING_SETUP_R_DISABLED to io_sq_offload_start() to fix this. > >> > >> Fixes: 6cae8095490ca ("io_uring: ensure that SQPOLL thread is started for exit") > >> Signed-off-by: Yang Yingliang <yangyingliang@xxxxxxxxxx> > >> --- > >> fs/io_uring.c | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > > > > I need an ack from Jens before I can take this... > > Ack, that looks like a bad merge. Fine to apply this patch, thanks. THanks, now queued up. greg k-h