[openwrt/openwrt] kernel: bump 5.10 to 5.10.25

[LEDE Commits]

ldir pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/d07ac3e37603bac438b21286b14867e7489ed7dd

commit d07ac3e37603bac438b21286b14867e7489ed7dd
Author: Kevin Darbyshire-Bryant <ldir at darbyshire-bryant.me.uk>
AuthorDate: Sat Mar 20 11:44:57 2021 +0000

    kernel: bump 5.10 to 5.10.25
    
    Straightforward refresh of patches using update_kernel.
    
    Removed (reverse-applicable):
    bmips/patches-5.10/010-v5.11-net-dsa-implement-a-central-TX-reallocation-procedur.patch
    
    Run tested: x86_64 (apu2)
    
    Signed-off-by: Kevin Darbyshire-Bryant <ldir at darbyshire-bryant.me.uk>
---
 include/kernel-version.mk                                           | 4 ++--
 .../patches-5.10/050-v5.13-net-dsa-b53-support-legacy-tags.patch    | 2 +-
 .../505-net-dsa-b53-add-support-for-BCM63xx-RGMIIs.patch            | 6 +++---
 target/linux/generic/hack-5.10/902-debloat_proc.patch               | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 1b91ef82fa..2dd18d7c0b 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL
 endif
 
 LINUX_VERSION-5.4 = .106
-LINUX_VERSION-5.10 = .24
+LINUX_VERSION-5.10 = .25
 
 LINUX_KERNEL_HASH-5.4.106 = cc873b2c39c1823d4bc4f6cde527943c8cfd28ae94cb517804b0f9679359c8db
-LINUX_KERNEL_HASH-5.10.24 = c6dcd04e5893c5d68b637188f904528e91f28d790cd49cf8a7fb817423bd763f
+LINUX_KERNEL_HASH-5.10.25 = 930ae76b9a3b64b98802849aca332d17a706f20595de21e1ae729b55ee461add
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
diff --git a/target/linux/bmips/patches-5.10/050-v5.13-net-dsa-b53-support-legacy-tags.patch b/target/linux/bmips/patches-5.10/050-v5.13-net-dsa-b53-support-legacy-tags.patch
index 59a7217663..269c2895af 100644
--- a/target/linux/bmips/patches-5.10/050-v5.13-net-dsa-b53-support-legacy-tags.patch
+++ b/target/linux/bmips/patches-5.10/050-v5.13-net-dsa-b53-support-legacy-tags.patch
@@ -28,7 +28,7 @@ Signed-off-by: David S. Miller <davem at davemloft.net>
  	  This driver adds support for Broadcom managed switch chips. It supports
 --- a/drivers/net/dsa/b53/b53_common.c
 +++ b/drivers/net/dsa/b53/b53_common.c
-@@ -2010,15 +2010,17 @@ enum dsa_tag_protocol b53_get_tag_protoc
+@@ -2028,15 +2028,17 @@ enum dsa_tag_protocol b53_get_tag_protoc
  {
  	struct b53_device *dev = ds->priv;
  
diff --git a/target/linux/bmips/patches-5.10/505-net-dsa-b53-add-support-for-BCM63xx-RGMIIs.patch b/target/linux/bmips/patches-5.10/505-net-dsa-b53-add-support-for-BCM63xx-RGMIIs.patch
index f5bc8807b1..0b69f45360 100644
--- a/target/linux/bmips/patches-5.10/505-net-dsa-b53-add-support-for-BCM63xx-RGMIIs.patch
+++ b/target/linux/bmips/patches-5.10/505-net-dsa-b53-add-support-for-BCM63xx-RGMIIs.patch
@@ -13,7 +13,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
 
 --- a/drivers/net/dsa/b53/b53_common.c
 +++ b/drivers/net/dsa/b53/b53_common.c
-@@ -1140,6 +1140,36 @@ static void b53_force_port_config(struct
+@@ -1155,6 +1155,36 @@ static void b53_force_port_config(struct
  	b53_write8(dev, B53_CTRL_PAGE, off, reg);
  }
  
@@ -50,7 +50,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
  static void b53_adjust_link(struct dsa_switch *ds, int port,
  			    struct phy_device *phydev)
  {
-@@ -1166,6 +1196,9 @@ static void b53_adjust_link(struct dsa_s
+@@ -1181,6 +1211,9 @@ static void b53_adjust_link(struct dsa_s
  			      tx_pause, rx_pause);
  	b53_force_link(dev, port, phydev->link);
  
@@ -60,7 +60,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
  	if (is531x5(dev) && phy_interface_is_rgmii(phydev)) {
  		if (port == 8)
  			off = B53_RGMII_CTRL_IMP;
-@@ -1358,6 +1391,9 @@ void b53_phylink_mac_link_up(struct dsa_
+@@ -1373,6 +1406,9 @@ void b53_phylink_mac_link_up(struct dsa_
  {
  	struct b53_device *dev = ds->priv;
  
diff --git a/target/linux/generic/hack-5.10/902-debloat_proc.patch b/target/linux/generic/hack-5.10/902-debloat_proc.patch
index 5a6d7d058e..3208e5554f 100644
--- a/target/linux/generic/hack-5.10/902-debloat_proc.patch
+++ b/target/linux/generic/hack-5.10/902-debloat_proc.patch
@@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
 
 --- a/fs/locks.c
 +++ b/fs/locks.c
-@@ -2996,6 +2996,8 @@ static const struct seq_operations locks
+@@ -2993,6 +2993,8 @@ static const struct seq_operations locks
  
  static int __init proc_locks_init(void)
  {