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
