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 <graysky@archlinux.us>
This commit is contained in:
committed by
Hauke Mehrtens
parent
048f0b1702
commit
b04d38a2ea
@@ -423,7 +423,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
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 <davem@davemloft.net>
|
||||
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);
|
||||
|
||||
|
||||
@@ -22,11 +22,9 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
|
||||
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
|
||||
|
||||
|
||||
@@ -39,11 +39,9 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
|
||||
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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user