[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: f1260ff15a71b8fc122b2c9abd8a7abffb6e0168
WARNING: Author mismatch between patch and upstream commit: Backport author: Harshvardhan Jha harshvardhan.j.jha@oracle.com Commit author: Vasily Averin vvs@virtuozzo.com
Status in newer kernel trees: 6.12.y | Present (exact SHA1) 6.6.y | Present (exact SHA1) 6.1.y | Present (exact SHA1) 5.15.y | Present (exact SHA1) 5.10.y | Not found
Note: The patch differs from the upstream commit: --- 1: f1260ff15a71 ! 1: ee7ccf9396c7 skbuff: introduce skb_expand_head() @@ Metadata ## Commit message ## skbuff: introduce skb_expand_head()
+ [ Upstream commit f1260ff15a71b8fc122b2c9abd8a7abffb6e0168 ] + Like skb_realloc_headroom(), new helper increases headroom of specified skb. Unlike skb_realloc_headroom(), it does not allocate a new skb if possible; copies skb->sk on new skb when as needed and frees original skb in case @@ Commit message
Signed-off-by: Vasily Averin vvs@virtuozzo.com Signed-off-by: David S. Miller davem@davemloft.net + (cherry picked from commit f1260ff15a71b8fc122b2c9abd8a7abffb6e0168) + Signed-off-by: Harshvardhan Jha harshvardhan.j.jha@oracle.com
## include/linux/skbuff.h ## @@ include/linux/skbuff.h: static inline struct sk_buff *__pskb_copy(struct sk_buff *skb, int headroom, ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-5.10.y | Success | Success | | stable/linux-5.4.y | Success | Success |