diff options
author | John Audia <graysky@archlinux.us> | 2022-04-27 14:14:45 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-05-01 14:13:15 +0200 |
commit | d90c7621f40fde2dd01d08b4463cde755173b6ed (patch) | |
tree | 022690f0e7d53e5a60124848a61fa0e0a9120a99 /target/linux/generic/backport-5.10 | |
parent | e9c14fa85f4d517ad1729b4b2a1a5ba1b316f189 (diff) | |
download | upstream-d90c7621f40fde2dd01d08b4463cde755173b6ed.tar.gz upstream-d90c7621f40fde2dd01d08b4463cde755173b6ed.tar.bz2 upstream-d90c7621f40fde2dd01d08b4463cde755173b6ed.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>
(cherry picked from commit e08942e76a162962892020a0f7e52ef751ec68e4)
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.patch | 4 |
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); |