aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.10
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2022-04-27 14:14:45 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-04-30 21:27:45 +0200
commite08942e76a162962892020a0f7e52ef751ec68e4 (patch)
tree4e05ac6eac9346b0c05f975da556f113a286194d /target/linux/generic/backport-5.10
parentd9ea9c06e98b597174e0e94e0a13934637c0c03e (diff)
downloadupstream-e08942e76a162962892020a0f7e52ef751ec68e4.tar.gz
upstream-e08942e76a162962892020a0f7e52ef751ec68e4.tar.bz2
upstream-e08942e76a162962892020a0f7e52ef751ec68e4.zip
kernel: bump 5.10 to 5.10.113
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>
Diffstat (limited to 'target/linux/generic/backport-5.10')
-rw-r--r--target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch4
1 files changed, 2 insertions, 2 deletions
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 fe12ffd9cc..42c16034e4 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 <davem@davemloft.net>
if (bgmac->irq < 0)
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
-@@ -4479,7 +4479,6 @@ static int macb_probe(struct platform_de
+@@ -4487,7 +4487,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;
-@@ -4592,15 +4591,11 @@ static int macb_probe(struct platform_de
+@@ -4600,15 +4599,11 @@ static int macb_probe(struct platform_de
if (bp->caps & MACB_CAPS_NEEDS_RSTONUBR)
bp->rx_intr_mask |= MACB_BIT(RXUBR);