kernel: bump 5.4 to 5.4.195 (#9408)

* kernel: bump 5.4 to 5.4.194

Signed-off-by: José Hwong <josehwong@hotmail.com>

* kernel: bump 5.4 to 5.4.195

Signed-off-by: José Hwong <josehwong@hotmail.com>
This commit is contained in:
José Hwong 2022-05-19 12:36:33 +08:00 committed by GitHub
parent 6c6f4d159f
commit bc45671c00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 13 additions and 13 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.4 = .193
LINUX_KERNEL_HASH-5.4.193 = 0d16d343956d311e3f4ab3f032fd626d8e6b67c0db94edd32f561407d374f2a0
LINUX_VERSION-5.4 = .195
LINUX_KERNEL_HASH-5.4.195 = f22f5b9df60f8d59988f9d48bb2f39cb5d7ec435ca4296abe352e8063140031d

View File

@ -24,7 +24,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
#include <linux/workqueue.h>
#include <linux/mdio.h>
#include <linux/io.h>
@@ -863,6 +864,9 @@ void phy_stop(struct phy_device *phydev)
@@ -898,6 +899,9 @@ void phy_stop(struct phy_device *phydev)
mutex_lock(&phydev->lock);
@ -34,7 +34,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
phydev->state = PHY_HALTED;
mutex_unlock(&phydev->lock);
@@ -925,6 +929,9 @@ void phy_state_machine(struct work_struc
@@ -960,6 +964,9 @@ void phy_state_machine(struct work_struc
old_state = phydev->state;

View File

@ -1524,7 +1524,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
lp->coalesce_count_tx = XAXIDMA_DFT_TX_THRESHOLD;
--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -1122,7 +1122,6 @@ static int xemaclite_of_probe(struct pla
@@ -1107,7 +1107,6 @@ static int xemaclite_of_probe(struct pla
struct net_device *ndev = NULL;
struct net_local *lp = NULL;
struct device *dev = &ofdev->dev;
@ -1532,7 +1532,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int rc = 0;
@@ -1164,12 +1163,9 @@ static int xemaclite_of_probe(struct pla
@@ -1149,12 +1148,9 @@ static int xemaclite_of_probe(struct pla
lp->next_rx_buf_to_use = 0x0;
lp->tx_ping_pong = get_bool(ofdev, "xlnx,tx-ping-pong");
lp->rx_ping_pong = get_bool(ofdev, "xlnx,rx-ping-pong");

View File

@ -246,7 +246,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
&vmalloc_op,
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -1988,10 +1988,12 @@ void __init init_mm_internals(void)
@@ -1984,10 +1984,12 @@ void __init init_mm_internals(void)
start_shepherd_timer();
#endif
#ifdef CONFIG_PROC_FS

View File

@ -1,6 +1,6 @@
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1830,6 +1830,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
@@ -1826,6 +1826,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
endchoice

View File

@ -125,7 +125,7 @@
#endif
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -723,6 +723,7 @@ void phy_stop_machine(struct phy_device *phydev)
@@ -728,6 +728,7 @@ void phy_stop_machine(struct phy_device *phydev)
phydev->state = PHY_UP;
mutex_unlock(&phydev->lock);
}

View File

@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1828,6 +1828,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
@@ -1824,6 +1824,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
The command-line arguments provided by the boot loader will be
appended to the the device tree bootargs property.

View File

@ -1,6 +1,6 @@
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1841,6 +1841,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
@@ -1837,6 +1837,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
endchoice

View File

@ -11,7 +11,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -549,7 +549,10 @@ static int phy_check_link_status(struct
@@ -554,7 +554,10 @@ static int phy_check_link_status(struct
phy_link_up(phydev);
} else if (!phydev->link && phydev->state != PHY_NOLINK) {
phydev->state = PHY_NOLINK;
@ -23,7 +23,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
}
return 0;
@@ -947,7 +950,10 @@ void phy_state_machine(struct work_struc
@@ -982,7 +985,10 @@ void phy_state_machine(struct work_struc
case PHY_HALTED:
if (phydev->link) {
phydev->link = 0;