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 <graysky@archlinux.us>
This commit is contained in:
committed by
Hauke Mehrtens
parent
76725938f1
commit
30cff7c3b0
@@ -607,7 +607,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
/*
|
||||
--- 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 <davem@davemloft.net>
|
||||
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 <davem@davemloft.net>
|
||||
}
|
||||
--- 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 <davem@davemloft.net>
|
||||
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 */
|
||||
|
||||
@@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
|
||||
|
||||
--- a/mm/page_alloc.c
|
||||
+++ b/mm/page_alloc.c
|
||||
@@ -6884,7 +6884,7 @@ static void __ref alloc_node_mem_map(str
|
||||
@@ -6886,7 +6886,7 @@ static void __ref alloc_node_mem_map(str
|
||||
mem_map = NODE_DATA(0)->node_mem_map;
|
||||
#if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM)
|
||||
if (page_to_pfn(mem_map) != pgdat->node_start_pfn)
|
||||
|
||||
@@ -21,7 +21,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
#define PPP_VERSION "2.4.2"
|
||||
|
||||
/*
|
||||
@@ -1373,12 +1378,37 @@ static void ppp_dev_priv_destructor(stru
|
||||
@@ -1378,12 +1383,37 @@ static void ppp_dev_priv_destructor(stru
|
||||
ppp_destroy_interface(ppp);
|
||||
}
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
|
||||
--- a/net/ipv4/fib_semantics.c
|
||||
+++ b/net/ipv4/fib_semantics.c
|
||||
@@ -141,6 +141,10 @@ const struct fib_prop fib_props[RTN_MAX
|
||||
@@ -142,6 +142,10 @@ const struct fib_prop fib_props[RTN_MAX
|
||||
.error = -EINVAL,
|
||||
.scope = RT_SCOPE_NOWHERE,
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user