From b04d38a2eaa5604aa7216e0c02846d96dc2d317f Mon Sep 17 00:00:00 2001 From: John Audia Date: Wed, 16 Mar 2022 16:06:23 -0400 Subject: kernel: bump 5.10 to 5.10.106 All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia --- ...next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch | 4 ++-- ...-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch | 9 ++------- ...18-2-net-dsa-Avoid-cross-chip-syncing-of-VLAN-filtering.patch | 7 +------ 3 files changed, 5 insertions(+), 15 deletions(-) (limited to 'target/linux/generic') diff --git a/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch b/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch index e49e5c2858..60b07e5a3e 100644 --- a/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch +++ b/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch @@ -423,7 +423,7 @@ Signed-off-by: David S. Miller if (bgmac->irq < 0) --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c -@@ -4456,7 +4456,6 @@ static int macb_probe(struct platform_de +@@ -4479,7 +4479,6 @@ static int macb_probe(struct platform_de struct net_device *dev; struct resource *regs; void __iomem *mem; @@ -431,7 +431,7 @@ Signed-off-by: David S. Miller struct macb *bp; int err, val; -@@ -4569,15 +4568,11 @@ static int macb_probe(struct platform_de +@@ -4592,15 +4591,11 @@ static int macb_probe(struct platform_de if (bp->caps & MACB_CAPS_NEEDS_RSTONUBR) bp->rx_intr_mask |= MACB_BIT(RXUBR); diff --git a/target/linux/generic/backport-5.10/773-v5.18-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch b/target/linux/generic/backport-5.10/773-v5.18-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch index 8c2aa32ec8..eb60134a1e 100644 --- a/target/linux/generic/backport-5.10/773-v5.18-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch +++ b/target/linux/generic/backport-5.10/773-v5.18-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch @@ -22,11 +22,9 @@ Signed-off-by: Marek Behún net/dsa/switch.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) -diff --git a/net/dsa/switch.c b/net/dsa/switch.c -index a44035872cff..659fd979cc0a 100644 --- a/net/dsa/switch.c +++ b/net/dsa/switch.c -@@ -104,23 +104,12 @@ static int dsa_switch_bridge_join(struct dsa_switch *ds, +@@ -104,23 +104,12 @@ static int dsa_switch_bridge_join(struct return 0; } @@ -52,7 +50,7 @@ index a44035872cff..659fd979cc0a 100644 /* If the bridge was vlan_filtering, the bridge core doesn't trigger an * event for changing vlan_filtering setting upon slave ports leaving * it. That is a good thing, because that lets us handle it and also -@@ -153,6 +142,30 @@ static int dsa_switch_bridge_leave(struct dsa_switch *ds, +@@ -153,6 +142,30 @@ static int dsa_switch_bridge_leave(struc if (err && err != EOPNOTSUPP) return err; } @@ -83,6 +81,3 @@ index a44035872cff..659fd979cc0a 100644 return 0; } --- -2.34.1 - diff --git a/target/linux/generic/backport-5.10/773-v5.18-2-net-dsa-Avoid-cross-chip-syncing-of-VLAN-filtering.patch b/target/linux/generic/backport-5.10/773-v5.18-2-net-dsa-Avoid-cross-chip-syncing-of-VLAN-filtering.patch index 8dfd2a94b3..0b36ef7cec 100644 --- a/target/linux/generic/backport-5.10/773-v5.18-2-net-dsa-Avoid-cross-chip-syncing-of-VLAN-filtering.patch +++ b/target/linux/generic/backport-5.10/773-v5.18-2-net-dsa-Avoid-cross-chip-syncing-of-VLAN-filtering.patch @@ -39,11 +39,9 @@ Signed-off-by: Marek Behún net/dsa/switch.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -diff --git a/net/dsa/switch.c b/net/dsa/switch.c -index 659fd979cc0a..2fe2f328d2d2 100644 --- a/net/dsa/switch.c +++ b/net/dsa/switch.c -@@ -162,9 +162,11 @@ static int dsa_switch_bridge_leave(struct dsa_switch *ds, +@@ -162,9 +162,11 @@ static int dsa_switch_bridge_leave(struc info->sw_index, info->port, info->br); @@ -58,6 +56,3 @@ index 659fd979cc0a..2fe2f328d2d2 100644 return 0; } --- -2.34.1 - -- cgit v1.2.3