From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Paul Chaignon <paul.chaignon@gmail.com>
Cc: stable@vger.kernel.org, Sasha Levin <sashal@kernel.org>,
netdev@vger.kernel.org, bpf@vger.kernel.org,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
David Ahern <dsahern@kernel.org>,
Tom Herbert <tom@herbertland.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>
Subject: Re: [PATCH stable 5.10,5.15 2/2] bpf: Fix L4 csum update on IPv6 in CHECKSUM_COMPLETE
Date: Mon, 23 Jun 2025 11:13:37 +0200 [thread overview]
Message-ID: <2025062302-oxford-squiggle-5fa3@gregkh> (raw)
In-Reply-To: <aFkYtN3WK19iK0-d@mail.gmail.com>
On Mon, Jun 23, 2025 at 11:04:52AM +0200, Paul Chaignon wrote:
> On Mon, Jun 23, 2025 at 10:46:47AM +0200, Greg Kroah-Hartman wrote:
> > On Tue, Jun 17, 2025 at 05:49:21PM +0200, Paul Chaignon wrote:
> > > [ Upstream commit ead7f9b8de65632ef8060b84b0c55049a33cfea1 ]
> > > [ Note: Fixed conflict due to unrelated comment change. ]
> >
> > This does not apply to the 5.15.y tree at all, due to:
> >
> > > - inet_proto_csum_replace_by_diff(ptr, skb, to, is_pseudo, false);
> > > + inet_proto_csum_replace_by_diff(ptr, skb, to, is_pseudo, is_ipv6);
> >
> > This chunk.
> >
> > Can you fix that up and resend just this one?
>
> It requires the 1/2 patch to apply correctly. I've tested them on the
> tip of 5.15.y (1c700860e8bc). Or is there some reason not to backport
> the 1/2 patch?
Argh, my fault, I applied patch 1/2 to 5.4.y and 5.10.y, not 5.15.y.
I'll go fix that up now, sorry for the noise.
greg "drowning in backports" k-h
next prev parent reply other threads:[~2025-06-23 9:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-17 15:48 [PATCH stable 5.10,5.15 1/2] net: Fix checksum update for ILA adj-transport Paul Chaignon
2025-06-17 15:49 ` [PATCH stable 5.10,5.15 2/2] bpf: Fix L4 csum update on IPv6 in CHECKSUM_COMPLETE Paul Chaignon
2025-06-19 9:02 ` Sasha Levin
2025-06-23 8:46 ` Greg Kroah-Hartman
2025-06-23 9:04 ` Paul Chaignon
2025-06-23 9:13 ` Greg Kroah-Hartman [this message]
2025-06-19 9:04 ` [PATCH stable 5.10,5.15 1/2] net: Fix checksum update for ILA adj-transport Sasha Levin
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=2025062302-oxford-squiggle-5fa3@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=paul.chaignon@gmail.com \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
--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.