From 30b0bd69fd57d6179d1d8825710d3bf2a40bd98b Mon Sep 17 00:00:00 2001 From: John Audia Date: Sun, 31 Oct 2021 07:08:40 -0400 Subject: [PATCH] kernel: bump 5.4 to 5.4.156 Removed upstreamed: backport-5.4/790-v5.7-net-switchdev-do-not-propagate-bridge-updates-across.patch All other patches automatically rebased. Signed-off-by: John Audia --- include/kernel-version.mk | 4 +- ...the-dst-buffer-to-of_get_mac_address.patch | 2 +- ...-not-propagate-bridge-updates-across.patch | 60 ------------------- .../hack-5.4/220-arm-gc_sections.patch | 2 +- ...or-support-mtd-name-from-device-tree.patch | 4 +- 5 files changed, 6 insertions(+), 66 deletions(-) delete mode 100644 target/linux/generic/backport-5.4/790-v5.7-net-switchdev-do-not-propagate-bridge-updates-across.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 17cb009f3c..cb4d195588 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-5.4 = .155 +LINUX_VERSION-5.4 = .156 LINUX_VERSION-5.10 = .77 -LINUX_KERNEL_HASH-5.4.155 = cc0c0f902748d251cb22d0e69e3b8d260c447eb0072ef853da15da6cce775038 +LINUX_KERNEL_HASH-5.4.156 = 06fe73e4623fcf1b3c0d0e1983d8286a2ff5b8fffbcb2163f4c01696a1c377fe LINUX_KERNEL_HASH-5.10.77 = d3b64edfc1dd7212e62ed733aeeb73d64ffd6d9658d322d44cddf1b41d5b8fc3 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) 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 3847610df5..bf0ff9eddf 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 @@ -1340,7 +1340,7 @@ Signed-off-by: David S. Miller } plat->phy_interface = of_get_phy_mode(np); -@@ -631,7 +631,7 @@ void stmmac_remove_config_dt(struct plat +@@ -639,7 +639,7 @@ void stmmac_remove_config_dt(struct plat } #else struct plat_stmmacenet_data * diff --git a/target/linux/generic/backport-5.4/790-v5.7-net-switchdev-do-not-propagate-bridge-updates-across.patch b/target/linux/generic/backport-5.4/790-v5.7-net-switchdev-do-not-propagate-bridge-updates-across.patch deleted file mode 100644 index bc8014b772..0000000000 --- a/target/linux/generic/backport-5.4/790-v5.7-net-switchdev-do-not-propagate-bridge-updates-across.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 07c6f9805f12f1bb538ef165a092b300350384aa Mon Sep 17 00:00:00 2001 -From: Russell King -Date: Wed, 26 Feb 2020 17:14:21 +0000 -Subject: [PATCH] net: switchdev: do not propagate bridge updates across - bridges - -When configuring a tree of independent bridges, propagating changes -from the upper bridge across a bridge master to the lower bridge -ports brings surprises. - -For example, a lower bridge may have vlan filtering enabled. It -may have a vlan interface attached to the bridge master, which may -then be incorporated into another bridge. As soon as the lower -bridge vlan interface is attached to the upper bridge, the lower -bridge has vlan filtering disabled. - -This occurs because switchdev recursively applies its changes to -all lower devices no matter what. - -Reviewed-by: Ido Schimmel -Tested-by: Ido Schimmel -Signed-off-by: Russell King -Reviewed-by: Florian Fainelli -Signed-off-by: David S. Miller ---- - net/switchdev/switchdev.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- a/net/switchdev/switchdev.c -+++ b/net/switchdev/switchdev.c -@@ -476,6 +476,9 @@ static int __switchdev_handle_port_obj_a - * necessary to go through this helper. - */ - netdev_for_each_lower_dev(dev, lower_dev, iter) { -+ if (netif_is_bridge_master(lower_dev)) -+ continue; -+ - err = __switchdev_handle_port_obj_add(lower_dev, port_obj_info, - check_cb, add_cb); - if (err && err != -EOPNOTSUPP) -@@ -528,6 +531,9 @@ static int __switchdev_handle_port_obj_d - * necessary to go through this helper. - */ - netdev_for_each_lower_dev(dev, lower_dev, iter) { -+ if (netif_is_bridge_master(lower_dev)) -+ continue; -+ - err = __switchdev_handle_port_obj_del(lower_dev, port_obj_info, - check_cb, del_cb); - if (err && err != -EOPNOTSUPP) -@@ -579,6 +585,9 @@ static int __switchdev_handle_port_attr_ - * necessary to go through this helper. - */ - netdev_for_each_lower_dev(dev, lower_dev, iter) { -+ if (netif_is_bridge_master(lower_dev)) -+ continue; -+ - err = __switchdev_handle_port_attr_set(lower_dev, port_attr_info, - check_cb, set_cb); - if (err && err != -EOPNOTSUPP) diff --git a/target/linux/generic/hack-5.4/220-arm-gc_sections.patch b/target/linux/generic/hack-5.4/220-arm-gc_sections.patch index 70457ab73a..14e2461797 100644 --- a/target/linux/generic/hack-5.4/220-arm-gc_sections.patch +++ b/target/linux/generic/hack-5.4/220-arm-gc_sections.patch @@ -21,7 +21,7 @@ Signed-off-by: Gabor Juhos --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -111,6 +111,7 @@ config ARM +@@ -112,6 +112,7 @@ config ARM select HAVE_UID16 select HAVE_VIRT_CPU_ACCOUNTING_GEN select IRQ_FORCED_THREADING diff --git a/target/linux/pistachio/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/pistachio/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch index 69a8303d2b..cdf0e49b21 100644 --- a/target/linux/pistachio/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch +++ b/target/linux/pistachio/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch @@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -4938,6 +4938,7 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -4939,6 +4939,7 @@ int spi_nor_scan(struct spi_nor *nor, co struct mtd_info *mtd = &nor->mtd; struct device_node *np = spi_nor_get_flash_node(nor); struct spi_nor_flash_parameter *params = &nor->params; @@ -18,7 +18,7 @@ Signed-off-by: Abhimanyu Vishwakarma int ret; int i; -@@ -5000,7 +5001,12 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -5001,7 +5002,12 @@ int spi_nor_scan(struct spi_nor *nor, co /* Init flash parameters based on flash_info struct and SFDP */ spi_nor_init_params(nor); -- 2.30.2