All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Eric Dumazet <edumazet@google.com>
Cc: fw@strlen.de, kuba@kernel.org, syzkaller@googlegroups.com,
	tom@herbertland.com, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] ila: call nf_unregister_net_hooks() sooner" failed to apply to 4.19-stable tree
Date: Mon, 9 Sep 2024 19:01:46 +0200	[thread overview]
Message-ID: <2024090940-singer-sterility-f1dc@gregkh> (raw)
In-Reply-To: <CANn89iJU9jPB+G5ETqwcEKcrRFt5ONVGF7=TsLnA21FUKT3+Rg@mail.gmail.com>

On Mon, Sep 09, 2024 at 09:59:49AM +0200, Eric Dumazet wrote:
> On Sun, Sep 8, 2024 at 2:51 PM <gregkh@linuxfoundation.org> wrote:
> >
> >
> > The patch below does not apply to the 4.19-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>.
> >
> > To reproduce the conflict and resubmit, you may use the following commands:
> >
> > git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.19.y
> > git checkout FETCH_HEAD
> > git cherry-pick -x 031ae72825cef43e4650140b800ad58bf7a6a466
> > # <resolve conflicts, build, test, etc.>
> > git commit -s
> > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024090859-daffodil-skillful-c1e1@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^..
> >
> > Possible dependencies:
> >
> > 031ae72825ce ("ila: call nf_unregister_net_hooks() sooner")
> >
> > thanks,
> >
> > greg k-h
> 
> Hi Greg, I think you can cherry-pick this patch from linux-5.3 era,
> adding the pre_exit() method
> 
> commit d7d99872c144a2c2f5d9c9d83627fa833836cba5
> Author: Eric Dumazet <edumazet@google.com>
> Date:   Tue Jun 18 11:08:59 2019 -0700
> 
>     netns: add pre_exit method to struct pernet_operations
> 
> Then cherry-picking 031ae72825cef43e4650140b800ad58bf7a6a466 will work
> just fine.

That worked, thanks!

greg k-h

      reply	other threads:[~2024-09-09 17:01 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-08 12:50 FAILED: patch "[PATCH] ila: call nf_unregister_net_hooks() sooner" failed to apply to 4.19-stable tree gregkh
2024-09-09  7:59 ` Eric Dumazet
2024-09-09 17:01   ` 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=2024090940-singer-sterility-f1dc@gregkh \
    --to=gregkh@linuxfoundation.org \
    --cc=edumazet@google.com \
    --cc=fw@strlen.de \
    --cc=kuba@kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=syzkaller@googlegroups.com \
    --cc=tom@herbertland.com \
    /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.