public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc: andrii@kernel.org, ast@kernel.org, jolsa@kernel.org,
	stable@vger.kernel.org, bpf <bpf@vger.kernel.org>
Subject: Re: FAILED: patch "[PATCH] bpf: support deferring bpf_link dealloc to after RCU grace" failed to apply to 6.8-stable tree
Date: Fri, 5 Apr 2024 18:31:43 +0200	[thread overview]
Message-ID: <2024040528-backroom-hardened-4248@gregkh> (raw)
In-Reply-To: <CAEf4BzY03zZrHUXTNop8+PMt=-d0+oOaWBnJyPTSSOvKv1mgNg@mail.gmail.com>

On Fri, Apr 05, 2024 at 09:21:15AM -0700, Andrii Nakryiko wrote:
> On Fri, Apr 5, 2024 at 9:15 AM Andrii Nakryiko
> <andrii.nakryiko@gmail.com> wrote:
> >
> > On Fri, Apr 5, 2024 at 2:50 AM <gregkh@linuxfoundation.org> wrote:
> > >
> > >
> > > The patch below does not apply to the 6.8-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>.
> > >
> >
> > This is strange, I get a clean auto-merged cherry-pick:
> >
> > $ git co linux-6.8.y
> > Updating files: 100% (10694/10694), done.
> > branch 'linux-6.8.y' set up to track 'stable/linux-6.8.y'.
> > Switched to a new branch 'linux-6.8.y'
> > $ git cp -x 1a80dbcb2dbaf6e4c216e62e30fa7d3daa8001ce
> > Auto-merging include/linux/bpf.h
> > Auto-merging kernel/bpf/syscall.c
> > Auto-merging kernel/trace/bpf_trace.c
> > [linux-6.8.y fd74c60792f5] bpf: support deferring bpf_link dealloc to
> > after RCU grace period
> >  Date: Wed Mar 27 22:24:26 2024 -0700
> >  3 files changed, 49 insertions(+), 6 deletions(-)
> >
> > Note that e9c856cabefb ("bpf: put uprobe link's path and task in
> > release callback") has to be backported at the same time. I'll
> > cherry-pick both and will send it just in case.
> >
> 
> Ah, so it doesn't build (trivial link->prog->sleepable ->
> link->prog->aux->sleepable change, will fix up). Not sure if possible,
> but it would be nice to distinguish between patch not applying vs it
> causing build (or test) failures, but no big deal.

I only have 1 script, sorry :)

thanks,

greg k-h

  reply	other threads:[~2024-04-05 16:31 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-05  9:50 FAILED: patch "[PATCH] bpf: support deferring bpf_link dealloc to after RCU grace" failed to apply to 6.8-stable tree gregkh
2024-04-05 16:15 ` Andrii Nakryiko
2024-04-05 16:21   ` Andrii Nakryiko
2024-04-05 16:31     ` Greg KH [this message]
2024-04-05 16:29 ` [PATCH 6.8.y 1/2] bpf: put uprobe link's path and task in release callback Andrii Nakryiko
2024-04-05 16:29   ` [PATCH 6.8.y 2/2] bpf: support deferring bpf_link dealloc to after RCU grace period Andrii Nakryiko

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=2024040528-backroom-hardened-4248@gregkh \
    --to=gregkh@linuxfoundation.org \
    --cc=andrii.nakryiko@gmail.com \
    --cc=andrii@kernel.org \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=jolsa@kernel.org \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox