From 30cff7c3b076308fac13610c3c6ab9eb6bb04e6f Mon Sep 17 00:00:00 2001 From: John Audia Date: Thu, 27 Jan 2022 05:44:38 -0500 Subject: kernel: bump 5.4 to 5.4.174 Removed upstreamed patches: layerscape/patches-5.4/302-dts-0083-arm64-ls1028a-qds-correct-bus-of-rtc.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.4.174&id=65816c1034769e714edb70f59a33bc5472d9e55f Build system: x86_64 Build-tested: ramips/mt7621 Signed-off-by: John Audia --- ...-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/generic/backport-5.4') 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 31e1781ee0..66d379b859 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 @@ -607,7 +607,7 @@ Signed-off-by: David S. Miller /* --- a/drivers/net/ethernet/freescale/fman/mac.c +++ b/drivers/net/ethernet/freescale/fman/mac.c -@@ -605,7 +605,6 @@ static int mac_probe(struct platform_dev +@@ -616,7 +616,6 @@ static int mac_probe(struct platform_dev struct platform_device *of_dev; struct resource res; struct mac_priv_s *priv; @@ -615,7 +615,7 @@ Signed-off-by: David S. Miller u32 val; u8 fman_id; int phy_if; -@@ -723,13 +722,12 @@ static int mac_probe(struct platform_dev +@@ -734,13 +733,12 @@ static int mac_probe(struct platform_dev priv->cell_index = (u8)val; /* Get the MAC address */ @@ -1492,7 +1492,7 @@ Signed-off-by: David S. Miller } --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c -@@ -1663,7 +1663,7 @@ static int axienet_probe(struct platform +@@ -1665,7 +1665,7 @@ static int axienet_probe(struct platform struct device_node *np; struct axienet_local *lp; struct net_device *ndev; @@ -1501,7 +1501,7 @@ Signed-off-by: David S. Miller struct resource *ethres; u32 value; -@@ -1835,13 +1835,14 @@ static int axienet_probe(struct platform +@@ -1837,13 +1837,14 @@ static int axienet_probe(struct platform dev_info(&pdev->dev, "Ethernet core IRQ not defined\n"); /* Retrieve the MAC address */ -- cgit v1.2.3