From: John Audia Date: Mon, 6 Feb 2023 11:28:36 +0000 (-0500) Subject: kernel: bump 5.10 to 5.10.167 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=712681458a65736d3fc625bb9c481c31b23c1f97;p=openwrt%2Fstaging%2Fnbd.git kernel: bump 5.10 to 5.10.167 All patches automatically rebased. Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia --- diff --git a/include/kernel-5.10 b/include/kernel-5.10 index 0c14e6b582..0198540361 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.10 = .166 -LINUX_KERNEL_HASH-5.10.166 = 0051a1780e5bda0efc68dafab7c728b8283d2b028fedb439418f478be7d3e1af +LINUX_VERSION-5.10 = .167 +LINUX_KERNEL_HASH-5.10.167 = d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 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 dbcdac8590..340a02afa7 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 @@ -646,7 +646,7 @@ } /* Reposition in the original skb */ -@@ -5189,6 +5210,20 @@ bool skb_try_coalesce(struct sk_buff *to +@@ -5188,6 +5209,20 @@ bool skb_try_coalesce(struct sk_buff *to if (skb_cloned(to)) return false; diff --git a/target/linux/generic/pending-5.10/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch b/target/linux/generic/pending-5.10/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch index 5a145abed3..c464b8e7ff 100644 --- a/target/linux/generic/pending-5.10/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch +++ b/target/linux/generic/pending-5.10/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch @@ -17,7 +17,7 @@ Signed-off-by: Alexander Duyck --- a/net/core/skbuff.c +++ b/net/core/skbuff.c -@@ -4166,6 +4166,15 @@ int skb_gro_receive(struct sk_buff *p, s +@@ -4165,6 +4165,15 @@ int skb_gro_receive(struct sk_buff *p, s if (unlikely(p->len + len >= 65536 || NAPI_GRO_CB(skb)->flush)) return -E2BIG;