kernel: refresh backport-5.15 patches

Refresh patches, removing unwanted git metadata from some backported
commits.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/target/linux/generic/backport-5.15/600-v5.18-page_pool-Add-allocation-stats.patch b/target/linux/generic/backport-5.15/600-v5.18-page_pool-Add-allocation-stats.patch
index 3dbfb7ccbace7bcb048f9a23f607119796767174..9e383de92cda6c6047bed57943e4590f6b585ddc 100644 (file)
--- a/target/linux/generic/backport-5.15/600-v5.18-page_pool-Add-allocation-stats.patch
+++ b/target/linux/generic/backport-5.15/600-v5.18-page_pool-Add-allocation-stats.patch
@@ -29,8 +29,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  net/core/page_pool.c    | 24 ++++++++++++++++++++----
  3 files changed, 51 insertions(+), 4 deletions(-)
 
-diff --git a/include/net/page_pool.h b/include/net/page_pool.h
-index 97c3c19872ff..1f27e8a48830 100644
 --- a/include/net/page_pool.h
 +++ b/include/net/page_pool.h
 @@ -82,6 +82,19 @@ struct page_pool_params {

diff --git a/target/linux/generic/backport-5.15/601-v5.18-page_pool-Add-recycle-stats.patch b/target/linux/generic/backport-5.15/601-v5.18-page_pool-Add-recycle-stats.patch
index e60979f4a7b59968a1ddf398c60efc9555c2c8bb..fb11f0035f863b694697225da512c91bbb557a33 100644 (file)
--- a/target/linux/generic/backport-5.15/601-v5.18-page_pool-Add-recycle-stats.patch
+++ b/target/linux/generic/backport-5.15/601-v5.18-page_pool-Add-recycle-stats.patch
@@ -19,8 +19,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  net/core/page_pool.c    | 30 ++++++++++++++++++++++++++++--
  2 files changed, 44 insertions(+), 2 deletions(-)
 
-diff --git a/include/net/page_pool.h b/include/net/page_pool.h
-index 1f27e8a48830..298af95bbf96 100644
 --- a/include/net/page_pool.h
 +++ b/include/net/page_pool.h
 @@ -93,6 +93,18 @@ struct page_pool_alloc_stats {

diff --git a/target/linux/generic/backport-5.15/602-v5.18-page_pool-Add-function-to-batch-and-return-stats.patch b/target/linux/generic/backport-5.15/602-v5.18-page_pool-Add-function-to-batch-and-return-stats.patch
index e5fbfd14f0651ef7c93c043982aefff5ea03c28d..41188fb7f2792c094910c004dcd76e3d1fc04185 100644 (file)
--- a/target/linux/generic/backport-5.15/602-v5.18-page_pool-Add-function-to-batch-and-return-stats.patch
+++ b/target/linux/generic/backport-5.15/602-v5.18-page_pool-Add-function-to-batch-and-return-stats.patch
@@ -15,8 +15,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  net/core/page_pool.c    | 25 +++++++++++++++++++++++++
  2 files changed, 42 insertions(+)
 
-diff --git a/include/net/page_pool.h b/include/net/page_pool.h
-index 298af95bbf96..ea5fb70e5101 100644
 --- a/include/net/page_pool.h
 +++ b/include/net/page_pool.h
 @@ -105,6 +105,23 @@ struct page_pool_recycle_stats {

diff --git a/target/linux/generic/backport-5.15/603-v5.19-page_pool-Add-recycle-stats-to-page_pool_put_page_bu.patch b/target/linux/generic/backport-5.15/603-v5.19-page_pool-Add-recycle-stats-to-page_pool_put_page_bu.patch
index e12c387bbcb6cbeb8a1495775b7e2dd5a65ac378..6ae3fb71331b1b38c6c2b5f9458c9717333ddb75 100644 (file)
--- a/target/linux/generic/backport-5.15/603-v5.19-page_pool-Add-recycle-stats-to-page_pool_put_page_bu.patch
+++ b/target/linux/generic/backport-5.15/603-v5.19-page_pool-Add-recycle-stats-to-page_pool_put_page_bu.patch
@@ -14,8 +14,6 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  net/core/page_pool.c | 15 +++++++++++++--
  1 file changed, 13 insertions(+), 2 deletions(-)
 
-diff --git a/net/core/page_pool.c b/net/core/page_pool.c
-index 1943c0f0307d..4af55d28ffa3 100644
 --- a/net/core/page_pool.c
 +++ b/net/core/page_pool.c
 @@ -36,6 +36,12 @@

diff --git a/target/linux/generic/backport-5.15/604-v5.19-net-page_pool-introduce-ethtool-stats.patch b/target/linux/generic/backport-5.15/604-v5.19-net-page_pool-introduce-ethtool-stats.patch
index fa3f1c8fb83d206b28716cd9d5ae81dc8a547db7..e5cf91ceeede4798520983b18fc4fe0deaeef586 100644 (file)
--- a/target/linux/generic/backport-5.15/604-v5.19-net-page_pool-introduce-ethtool-stats.patch
+++ b/target/linux/generic/backport-5.15/604-v5.19-net-page_pool-introduce-ethtool-stats.patch
@@ -15,8 +15,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  net/core/page_pool.c    | 63 ++++++++++++++++++++++++++++++++++++++++-
  2 files changed, 83 insertions(+), 1 deletion(-)
 
-diff --git a/include/net/page_pool.h b/include/net/page_pool.h
-index ea5fb70e5101..813c93499f20 100644
 --- a/include/net/page_pool.h
 +++ b/include/net/page_pool.h
 @@ -115,6 +115,10 @@ struct page_pool_stats {

diff --git a/target/linux/generic/backport-5.15/605-v5.18-xdp-introduce-flags-field-in-xdp_buff-xdp_frame.patch b/target/linux/generic/backport-5.15/605-v5.18-xdp-introduce-flags-field-in-xdp_buff-xdp_frame.patch
index 529b504ed8ea53fecf8550131c07591eed026cdb..4a914404a2f9ec6e46da01fc217c1e7074a2b72d 100644 (file)
--- a/target/linux/generic/backport-5.15/605-v5.18-xdp-introduce-flags-field-in-xdp_buff-xdp_frame.patch
+++ b/target/linux/generic/backport-5.15/605-v5.18-xdp-introduce-flags-field-in-xdp_buff-xdp_frame.patch
@@ -22,8 +22,6 @@ Signed-off-by: Alexei Starovoitov <ast@kernel.org>
  include/net/xdp.h | 29 +++++++++++++++++++++++++++++
  1 file changed, 29 insertions(+)
 
-diff --git a/include/net/xdp.h b/include/net/xdp.h
-index 8f0812e4996d..485e9495a690 100644
 --- a/include/net/xdp.h
 +++ b/include/net/xdp.h
 @@ -66,6 +66,10 @@ struct xdp_txq_info {

diff --git a/target/linux/generic/backport-5.15/606-v5.18-xdp-add-frags-support-to-xdp_return_-buff-frame.patch b/target/linux/generic/backport-5.15/606-v5.18-xdp-add-frags-support-to-xdp_return_-buff-frame.patch
index a852c4d5b0fe36668730f2ed1eeaf49b19de4892..86d24367dd69d023679f50194413f8693a1fc7ef 100644 (file)
--- a/target/linux/generic/backport-5.15/606-v5.18-xdp-add-frags-support-to-xdp_return_-buff-frame.patch
+++ b/target/linux/generic/backport-5.15/606-v5.18-xdp-add-frags-support-to-xdp_return_-buff-frame.patch
@@ -17,8 +17,6 @@ Signed-off-by: Alexei Starovoitov <ast@kernel.org>
  net/core/xdp.c    | 54 ++++++++++++++++++++++++++++++++++++++++++++++-
  2 files changed, 69 insertions(+), 3 deletions(-)
 
-diff --git a/include/net/xdp.h b/include/net/xdp.h
-index 1f8641ec658e..8463dea8b4db 100644
 --- a/include/net/xdp.h
 +++ b/include/net/xdp.h
 @@ -275,10 +275,24 @@ void __xdp_release_frame(void *data, str

diff --git a/target/linux/generic/backport-5.15/607-v5.18-net-skbuff-add-size-metadata-to-skb_shared_info-for-.patch b/target/linux/generic/backport-5.15/607-v5.18-net-skbuff-add-size-metadata-to-skb_shared_info-for-.patch
index ea020d4e9feeb2117c931d699a252390669f4582..a0344a332a386d655730fd22405c23e70424971c 100644 (file)
--- a/target/linux/generic/backport-5.15/607-v5.18-net-skbuff-add-size-metadata-to-skb_shared_info-for-.patch
+++ b/target/linux/generic/backport-5.15/607-v5.18-net-skbuff-add-size-metadata-to-skb_shared_info-for-.patch
@@ -19,8 +19,6 @@ Signed-off-by: Alexei Starovoitov <ast@kernel.org>
  include/linux/skbuff.h | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
-index bf11e1fbd69b..8131d0de7559 100644
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
 @@ -567,6 +567,7 @@ struct skb_shared_info {

diff --git a/target/linux/generic/backport-5.15/608-v5.18-net-veth-Account-total-xdp_frame-len-running-ndo_xdp.patch b/target/linux/generic/backport-5.15/608-v5.18-net-veth-Account-total-xdp_frame-len-running-ndo_xdp.patch
index 5ca38d24037ec8c2c2558a5212738b3a38886bb1..3bdba8728cfadefd38be569641604703b76d3841 100644 (file)
--- a/target/linux/generic/backport-5.15/608-v5.18-net-veth-Account-total-xdp_frame-len-running-ndo_xdp.patch
+++ b/target/linux/generic/backport-5.15/608-v5.18-net-veth-Account-total-xdp_frame-len-running-ndo_xdp.patch
@@ -20,8 +20,6 @@ Link: https://lore.kernel.org/bpf/54f9fd3bb65d190daf2c0bbae2f852ff16cfbaa0.16469
  include/net/xdp.h  | 14 ++++++++++++++
  2 files changed, 16 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/net/veth.c b/drivers/net/veth.c
-index 58b20ea171dd..b77ce3fdcfe8 100644
 --- a/drivers/net/veth.c
 +++ b/drivers/net/veth.c
 @@ -501,7 +501,7 @@ static int veth_xdp_xmit(struct net_devi

diff --git a/target/linux/generic/backport-5.15/609-v5.18-veth-Allow-jumbo-frames-in-xdp-mode.patch b/target/linux/generic/backport-5.15/609-v5.18-veth-Allow-jumbo-frames-in-xdp-mode.patch
index c8627e0f714575d8c38d26ce28fb91323c82d389..08744be52438675499b0993dbdfc4576f4b75657 100644 (file)
--- a/target/linux/generic/backport-5.15/609-v5.18-veth-Allow-jumbo-frames-in-xdp-mode.patch
+++ b/target/linux/generic/backport-5.15/609-v5.18-veth-Allow-jumbo-frames-in-xdp-mode.patch
@@ -18,8 +18,6 @@ Link: https://lore.kernel.org/bpf/d5dc039c3d4123426e7023a488c449181a7bc57f.16469
  drivers/net/veth.c | 11 ++++++++---
  1 file changed, 8 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/net/veth.c b/drivers/net/veth.c
-index bfae15ec902b..1b5714926d81 100644
 --- a/drivers/net/veth.c
 +++ b/drivers/net/veth.c
 @@ -1470,9 +1470,14 @@ static int veth_xdp_set(struct net_devic