From: Greg KH <gregkh@linuxfoundation.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: dmm@fb.com, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] io_uring: allow retry for O_NONBLOCK if async is supported" failed to apply to 5.14-stable tree
Date: Sat, 18 Sep 2021 14:59:32 +0200 [thread overview]
Message-ID: <YUXitAkwde0qNmMH@kroah.com> (raw)
In-Reply-To: <03bed564-b681-c1c1-03da-4bc9db9d3621@kernel.dk>
On Sat, Sep 18, 2021 at 06:49:35AM -0600, Jens Axboe wrote:
> On 9/18/21 6:47 AM, Greg KH wrote:
> > On Sat, Sep 18, 2021 at 06:44:16AM -0600, Jens Axboe wrote:
> >> On 9/18/21 6:34 AM, gregkh@linuxfoundation.org wrote:
> >>>
> >>> The patch below does not apply to the 5.14-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>.
> >>
> >> Just a trivial fuzz, here's a fixed version.
> >
> > Sorry, no, the fuzz was easy, this breaks the build:
> >
> > fs/io_uring.c: In function ‘io_prep_rw’:
> > fs/io_uring.c:2715:47: error: implicit declaration of function ‘io_file_supports_nowait’; did you mean ‘io_file_supports_async’? [-Werror=implicit-function-declaration]
> > 2715 | ((file->f_flags & O_NONBLOCK) && !io_file_supports_nowait(req, rw)))
> > | ^~~~~~~~~~~~~~~~~~~~~~~
> > | io_file_supports_async
> > CHK kernel/kheaders_data.tar.xz
> > cc1: some warnings being treated as errors
> >
> >
> > Any hint as to what that function would be in 5.14.y?
>
> Ah sorry I'm an idiot, it should be that io_file_supports_nowait() that
> also caused the fuzz in applying.
This version worked, thanks!
greg k-h
prev parent reply other threads:[~2021-09-18 12:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-18 12:34 FAILED: patch "[PATCH] io_uring: allow retry for O_NONBLOCK if async is supported" failed to apply to 5.14-stable tree gregkh
2021-09-18 12:44 ` Jens Axboe
2021-09-18 12:47 ` Greg KH
2021-09-18 12:49 ` Jens Axboe
2021-09-18 12:59 ` Greg KH [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YUXitAkwde0qNmMH@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=axboe@kernel.dk \
--cc=dmm@fb.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.