Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 15 Jul 2021 19:32:47 +0200
From:   Greg KH <gregkh@linuxfoundation.org>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Yang Yingliang <yangyingliang@huawei.com>,
        linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: Re: [PATCH stable-5.10] io_uring: fix clear IORING_SETUP_R_DISABLED
 in wrong function
Message-ID: <YPBxP6kNmTKLrxKI@kroah.com>
References: <20210715131825.2410912-1-yangyingliang@huawei.com>
 <YPA2kfnTb5VtSTMm@kroah.com>
 <2d9aa268-fd78-17ec-df0f-00daa1138a72@kernel.dk>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <2d9aa268-fd78-17ec-df0f-00daa1138a72@kernel.dk>
Precedence: bulk

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@huawei.com>
> >> ---
> >>  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