aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2021-03-20 11:44:57 +0000
committerKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2021-03-24 11:39:05 +0000
commitd07ac3e37603bac438b21286b14867e7489ed7dd (patch)
treedff869a328fad9f67a47307c22a376e571baa3fa /target/linux
parenteb964298b38784aa39de1c718d200cffbf96e066 (diff)
downloadupstream-d07ac3e37603bac438b21286b14867e7489ed7dd.tar.gz
upstream-d07ac3e37603bac438b21286b14867e7489ed7dd.tar.bz2
upstream-d07ac3e37603bac438b21286b14867e7489ed7dd.zip
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@darbyshire-bryant.me.uk>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/bmips/patches-5.10/050-v5.13-net-dsa-b53-support-legacy-tags.patch2
-rw-r--r--target/linux/bmips/patches-5.10/505-net-dsa-b53-add-support-for-BCM63xx-RGMIIs.patch6
-rw-r--r--target/linux/generic/hack-5.10/902-debloat_proc.patch2
3 files changed, 5 insertions, 5 deletions
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@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@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@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@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@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)
{