Re: FAILED: patch "[PATCH] io_uring: fix up O_NONBLOCK handling for sockets" failed to apply to 5.3-stable tree

[Jens Axboe <axboe@kernel.dk>]

On 10/28/19 2:26 AM, Sasha Levin wrote:
> On Sun, Oct 27, 2019 at 02:39:06PM -0600, Jens Axboe wrote:
>> On 10/27/19 2:26 PM, Greg KH wrote:
>>> On Sun, Oct 27, 2019 at 02:22:06PM -0600, Jens Axboe wrote:
>>>> On 10/27/19 2:00 PM, Greg KH wrote:
>>>>> On Sun, Oct 27, 2019 at 12:58:14PM -0600, Jens Axboe wrote:
>>>>>> On 10/27/19 9:53 AM, gregkh@linuxfoundation.org wrote:
>>>>>>>
>>>>>>> The patch below does not apply to the 5.3-stable tree.
>>>>>>> If someone wants it applied there, or to any other stable or longterm
>>>>>>> tree, then please email the backport, including the original git commit
>>>>>>> id to <stable@vger.kernel.org>.
>>>>>>
>>>>>> I can fix this up, but I probably need to see Sasha's queue first for
>>>>>> the io_uring patches. I need to base it against that.
>>>>>
>>>>> Ok, wait for the next 5.3.y release in a few days and send stuff off of
>>>>> that if you can.
>>>>
>>>> Is there no "current" or similar tree to work of off? Would be a shame
>>>> to miss the next one, especially since the newer fixes are already in.
>>>
>>> I'm about to push out the -rcs right now.  You can base off of that and
>>> send me the patch and I'll add it, or just wait a few days, either is
>>> fine.
>>
>> Sounds good, thanks Greg.
> 
> I'll queue up a backport for this. The conflict is due to not having the
> io_queue_sqe()/__io_queue_sqe() split introduced by 4fe2c963154c3
> ("io_uring: add support for link with drain").

Thanks!

-- 
Jens Axboe