aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.10
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-04-29 04:00:30 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-04-30 00:01:12 +0200
commit80c1105b0339516344f12364a599070ab1c9a41a (patch)
tree408eac16b110a5e0d9854abd91a35e0dca89f7bb /target/linux/generic/backport-5.10
parent4a043dc9d46e36882afbecb20f479e335549bd4b (diff)
downloadupstream-80c1105b0339516344f12364a599070ab1c9a41a.tar.gz
upstream-80c1105b0339516344f12364a599070ab1c9a41a.tar.bz2
upstream-80c1105b0339516344f12364a599070ab1c9a41a.zip
kernel: bump 5.10 to 5.10.179
All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/backport-5.10')
-rw-r--r--target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch8
-rw-r--r--target/linux/generic/backport-5.10/740-v5.13-0006-net-dsa-b53-mmap-Add-device-tree-support.patch4
2 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch b/target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch
index 09fb69f251..dad4803848 100644
--- a/target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch
+++ b/target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch
@@ -677,7 +677,7 @@
#if IS_ENABLED(CONFIG_NF_CONNTRACK)
#include <linux/netfilter/nf_conntrack_common.h>
#endif
-@@ -786,7 +787,8 @@ struct sk_buff {
+@@ -787,7 +788,8 @@ struct sk_buff {
fclone:2,
peeked:1,
head_frag:1,
@@ -687,7 +687,7 @@
#ifdef CONFIG_SKB_EXTENSIONS
__u8 active_extensions;
#endif
-@@ -3029,9 +3031,15 @@ static inline void skb_frag_ref(struct s
+@@ -3030,9 +3032,15 @@ static inline void skb_frag_ref(struct s
*
* Releases a reference on the paged fragment @frag.
*/
@@ -705,7 +705,7 @@
}
/**
-@@ -3043,7 +3051,7 @@ static inline void __skb_frag_unref(skb_
+@@ -3044,7 +3052,7 @@ static inline void __skb_frag_unref(skb_
*/
static inline void skb_frag_unref(struct sk_buff *skb, int f)
{
@@ -714,7 +714,7 @@
}
/**
-@@ -4642,5 +4650,12 @@ static inline u64 skb_get_kcov_handle(st
+@@ -4643,5 +4651,12 @@ static inline u64 skb_get_kcov_handle(st
#endif
}
diff --git a/target/linux/generic/backport-5.10/740-v5.13-0006-net-dsa-b53-mmap-Add-device-tree-support.patch b/target/linux/generic/backport-5.10/740-v5.13-0006-net-dsa-b53-mmap-Add-device-tree-support.patch
index c1014b20bc..48494d13e4 100644
--- a/target/linux/generic/backport-5.10/740-v5.13-0006-net-dsa-b53-mmap-Add-device-tree-support.patch
+++ b/target/linux/generic/backport-5.10/740-v5.13-0006-net-dsa-b53-mmap-Add-device-tree-support.patch
@@ -24,8 +24,8 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/io.h>
-@@ -228,11 +229,65 @@ static const struct b53_io_ops b53_mmap_
- .write64 = b53_mmap_write64,
+@@ -242,11 +243,65 @@ static const struct b53_io_ops b53_mmap_
+ .phy_write16 = b53_mmap_phy_write16,
};
+static int b53_mmap_probe_of(struct platform_device *pdev,