aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.4
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-12-29 10:23:53 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2022-01-03 01:00:03 +0100
commit7bf62e2451100620925b66dfee9c0a97dfbab90e (patch)
treed274ecbe514b5f2fbdd7123aef96a9a0c3b185bc /target/linux/generic/backport-5.4
parentd9c2b0cfdd1c8a377c7fa67e34437a726cf16d08 (diff)
downloadupstream-7bf62e2451100620925b66dfee9c0a97dfbab90e.tar.gz
upstream-7bf62e2451100620925b66dfee9c0a97dfbab90e.tar.bz2
upstream-7bf62e2451100620925b66dfee9c0a97dfbab90e.zip
kernel: bump 5.4 to 5.4.169
All patches automatically rebased. Build system: x86_64 Build-tested: ramips/mt7621* *Had to revert 7f1edbd in order to build due to FS#4149 Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/generic/backport-5.4')
-rw-r--r--target/linux/generic/backport-5.4/782-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.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch b/target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
index 764fa79d25..31e1781ee0 100644
--- a/target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
+++ b/target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
@@ -334,7 +334,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
-@@ -2420,7 +2420,6 @@ static int bcm_sysport_probe(struct plat
+@@ -2423,7 +2423,6 @@ static int bcm_sysport_probe(struct plat
struct bcm_sysport_priv *priv;
struct device_node *dn;
struct net_device *dev;
@@ -342,7 +342,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
u32 txq, rxq;
int ret;
-@@ -2502,12 +2501,10 @@ static int bcm_sysport_probe(struct plat
+@@ -2505,12 +2504,10 @@ static int bcm_sysport_probe(struct plat
}
/* Initialize netdevice members */