From bc45671c001c7c9e66c55ffacca1c036eb35a778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Hwong?= <88561480+JoseCoW@users.noreply.github.com> Date: Thu, 19 May 2022 12:36:33 +0800 Subject: [PATCH] kernel: bump 5.4 to 5.4.195 (#9408) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * kernel: bump 5.4 to 5.4.194 Signed-off-by: José Hwong * kernel: bump 5.4 to 5.4.195 Signed-off-by: José Hwong --- include/kernel-5.4 | 4 ++-- .../737-v5.5-net-phy-add-core-phylib-sfp-support.patch | 4 ++-- ...t-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch | 4 ++-- target/linux/generic/hack-5.4/902-debloat_proc.patch | 2 +- .../ipq40xx/patches-5.4/900-arm-add-cmdline-override.patch | 2 +- .../linux/ipq40xx/patches-5.4/995-add-qca-rfs-support.patch | 2 +- .../0067-generic-Mangle-bootloader-s-kernel-arguments.patch | 2 +- .../ipq806x/patches-5.4/900-arm-add-cmdline-override.patch | 2 +- .../patches-5.4/990-NET-no-auto-carrier-off-support.patch | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/kernel-5.4 b/include/kernel-5.4 index b820a01c9..30ddee920 100644 --- a/include/kernel-5.4 +++ b/include/kernel-5.4 @@ -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 diff --git a/target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch b/target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch index edfe15172..079713136 100644 --- a/target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch +++ b/target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch @@ -24,7 +24,7 @@ Signed-off-by: Russell King #include #include #include -@@ -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 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; 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 44511286d..22360e9d7 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 @@ -1524,7 +1524,7 @@ Signed-off-by: David S. Miller 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 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"); diff --git a/target/linux/generic/hack-5.4/902-debloat_proc.patch b/target/linux/generic/hack-5.4/902-debloat_proc.patch index 0309b3c3c..afde1e88d 100644 --- a/target/linux/generic/hack-5.4/902-debloat_proc.patch +++ b/target/linux/generic/hack-5.4/902-debloat_proc.patch @@ -246,7 +246,7 @@ Signed-off-by: Felix Fietkau &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 diff --git a/target/linux/ipq40xx/patches-5.4/900-arm-add-cmdline-override.patch b/target/linux/ipq40xx/patches-5.4/900-arm-add-cmdline-override.patch index 5911f7140..9ec11fc09 100755 --- a/target/linux/ipq40xx/patches-5.4/900-arm-add-cmdline-override.patch +++ b/target/linux/ipq40xx/patches-5.4/900-arm-add-cmdline-override.patch @@ -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 diff --git a/target/linux/ipq40xx/patches-5.4/995-add-qca-rfs-support.patch b/target/linux/ipq40xx/patches-5.4/995-add-qca-rfs-support.patch index 0b572b240..fd20c6247 100644 --- a/target/linux/ipq40xx/patches-5.4/995-add-qca-rfs-support.patch +++ b/target/linux/ipq40xx/patches-5.4/995-add-qca-rfs-support.patch @@ -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); } diff --git a/target/linux/ipq806x/patches-5.4/0067-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/ipq806x/patches-5.4/0067-generic-Mangle-bootloader-s-kernel-arguments.patch index 33c77fb72..3a0695b5b 100644 --- a/target/linux/ipq806x/patches-5.4/0067-generic-Mangle-bootloader-s-kernel-arguments.patch +++ b/target/linux/ipq806x/patches-5.4/0067-generic-Mangle-bootloader-s-kernel-arguments.patch @@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella --- 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. diff --git a/target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch b/target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch index 17f20f068..87d7015ff 100644 --- a/target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch +++ b/target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch @@ -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 diff --git a/target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch b/target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch index 8b95eacab..9eea427f3 100644 --- a/target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch +++ b/target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch @@ -11,7 +11,7 @@ Signed-off-by: John Crispin --- 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 } 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;