[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: dd89a81d850fa9a65f67b4527c0e420d15bf836c
WARNING: Author mismatch between patch and upstream commit:
Backport author: libo.chen.cn@xxxxxxxxxxxxx
Commit author: Willem de Bruijn <willemb@xxxxxxxxxx>
Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.6.y | Present (different SHA1: 3db4395332e7)
6.1.y | Present (different SHA1: 5a2e37bc648a)
5.15.y | Not found
Note: The patch differs from the upstream commit:
---
1: dd89a81d850fa ! 1: 9e6170db49f05 fou: remove warn in gue_gro_receive on unsupported protocol
@@ Metadata
## Commit message ##
fou: remove warn in gue_gro_receive on unsupported protocol
+ [ Upstream commit dd89a81d850fa9a65f67b4527c0e420d15bf836c ]
+
Drop the WARN_ON_ONCE inn gue_gro_receive if the encapsulated type is
not known or does not have a GRO handler.
@@ Commit message
Reviewed-by: Eric Dumazet <edumazet@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20240614122552.1649044-1-willemdebruijn.kernel@xxxxxxxxx
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
+ Signed-off-by: Libo Chen <libo.chen.cn@xxxxxxxxxxxxx>
- ## net/ipv4/fou_core.c ##
-@@ net/ipv4/fou_core.c: static struct sk_buff *gue_gro_receive(struct sock *sk,
+ ## net/ipv4/fou.c ##
+@@ net/ipv4/fou.c: static struct sk_buff *gue_gro_receive(struct sock *sk,
offloads = NAPI_GRO_CB(skb)->is_ipv6 ? inet6_offloads : inet_offloads;
ops = rcu_dereference(offloads[proto]);
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.15.y | Success | Success |
