From f3081567dfab4f96ca64ce844f93e7d574802ea1 Mon Sep 17 00:00:00 2001 From: Beginner <70857188+Beginner-Go@users.noreply.github.com> Date: Mon, 23 Aug 2021 21:50:56 +0800 Subject: [PATCH] kernel: bump 5.10 to 5.10.60 (#7688) * kernel: bump 5.10 to 5.10.57 No deleted or manually refreshed patches. Signed-off-by: Rui Salvaterra * kernel: bump 5.10 to 5.10.58 No deleted or manually refreshed patches. Signed-off-by: Rui Salvaterra * kernel: bump 5.10 to 5.10.59 No deleted or manually refreshed patches. Signed-off-by: Rui Salvaterra * kernel: bump 5.10 to 5.10.60 No deleted or manually refreshed patches. Signed-off-by: Rui Salvaterra Co-authored-by: Rui Salvaterra --- include/kernel-version.mk | 4 ++-- ...forwarding-path-for-bridge-pppoe-dev.patch | 2 +- ...setup-core-clock-even-in-TRGMII-mode.patch | 2 +- ...-mt7530-Add-support-for-EEE-features.patch | 6 +++--- .../hack-5.10/221-module_exports.patch | 2 +- .../hack-5.10/904-debloat_dma_buf.patch | 2 +- .../0028-NET-lantiq-various-etop-fixes.patch | 4 ++-- .../patches-5.10/410-bt-mtk-serial-fix.patch | 2 +- .../700-allocate_interface_by_label.patch | 19 +++++++++---------- ...12-pcengines-apu2-detect-apuv4-board.patch | 2 +- 10 files changed, 22 insertions(+), 23 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 79c03d9d7..8b003b59e 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-5.4 = .140 -LINUX_VERSION-5.10 = .57 +LINUX_VERSION-5.10 = .60 LINUX_KERNEL_HASH-5.4.140 = 2c657a2df4f2e805ac50aeb39ecf5d1e4cb1501e7fcf15eafd14486b587f7e43 -LINUX_KERNEL_HASH-5.10.57 = 00bbaeaac17f82d9a6d93cbc42cafd39d3b2fa3a6087333503d2344fa5e3142d +LINUX_KERNEL_HASH-5.10.60 = 696ff7753f6c7c5123dbcb0a22d693cb358c760c61a76649531b6a207155f78d remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/generic/backport-5.10/610-v5.13-15-net-ppp-resolve-forwarding-path-for-bridge-pppoe-dev.patch b/target/linux/generic/backport-5.10/610-v5.13-15-net-ppp-resolve-forwarding-path-for-bridge-pppoe-dev.patch index aaa6fd745..e74f47c23 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-15-net-ppp-resolve-forwarding-path-for-bridge-pppoe-dev.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-15-net-ppp-resolve-forwarding-path-for-bridge-pppoe-dev.patch @@ -12,7 +12,7 @@ Signed-off-by: Pablo Neira Ayuso --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c -@@ -1450,12 +1450,34 @@ static void ppp_dev_priv_destructor(stru +@@ -1461,12 +1461,34 @@ static void ppp_dev_priv_destructor(stru ppp_destroy_interface(ppp); } diff --git a/target/linux/generic/backport-5.10/780-net-dsa-mt7530-setup-core-clock-even-in-TRGMII-mode.patch b/target/linux/generic/backport-5.10/780-net-dsa-mt7530-setup-core-clock-even-in-TRGMII-mode.patch index 951ae9c66..f3a6f948a 100644 --- a/target/linux/generic/backport-5.10/780-net-dsa-mt7530-setup-core-clock-even-in-TRGMII-mode.patch +++ b/target/linux/generic/backport-5.10/780-net-dsa-mt7530-setup-core-clock-even-in-TRGMII-mode.patch @@ -21,7 +21,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -435,34 +435,32 @@ mt7530_pad_clk_setup(struct dsa_switch * +@@ -436,34 +436,32 @@ mt7530_pad_clk_setup(struct dsa_switch * TD_DM_DRVP(8) | TD_DM_DRVN(8)); /* Setup core clock for MT7530 */ diff --git a/target/linux/generic/backport-5.10/781-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch b/target/linux/generic/backport-5.10/781-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch index 28576bbfd..bba313669 100644 --- a/target/linux/generic/backport-5.10/781-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch +++ b/target/linux/generic/backport-5.10/781-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch @@ -17,7 +17,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -2269,6 +2269,17 @@ static void mt753x_phylink_mac_link_up(s +@@ -2270,6 +2270,17 @@ static void mt753x_phylink_mac_link_up(s mcr |= PMCR_RX_FC_EN; } @@ -35,7 +35,7 @@ Signed-off-by: David S. Miller mt7530_set(priv, MT7530_PMCR_P(port), mcr); } -@@ -2499,6 +2510,36 @@ mt753x_phy_write(struct dsa_switch *ds, +@@ -2500,6 +2511,36 @@ mt753x_phy_write(struct dsa_switch *ds, return priv->info->phy_write(ds, port, regnum, val); } @@ -72,7 +72,7 @@ Signed-off-by: David S. Miller static const struct dsa_switch_ops mt7530_switch_ops = { .get_tag_protocol = mtk_get_tag_protocol, .setup = mt753x_setup, -@@ -2527,6 +2568,8 @@ static const struct dsa_switch_ops mt753 +@@ -2528,6 +2569,8 @@ static const struct dsa_switch_ops mt753 .phylink_mac_an_restart = mt753x_phylink_mac_an_restart, .phylink_mac_link_down = mt753x_phylink_mac_link_down, .phylink_mac_link_up = mt753x_phylink_mac_link_up, diff --git a/target/linux/generic/hack-5.10/221-module_exports.patch b/target/linux/generic/hack-5.10/221-module_exports.patch index 2fcb2d980..cd38125f2 100644 --- a/target/linux/generic/hack-5.10/221-module_exports.patch +++ b/target/linux/generic/hack-5.10/221-module_exports.patch @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau } \ \ /* __*init sections */ \ -@@ -1018,6 +1028,8 @@ +@@ -1019,6 +1029,8 @@ #define COMMON_DISCARDS \ SANITIZER_DISCARDS \ diff --git a/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch b/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch index 2f5f68506..4ed40bb63 100644 --- a/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch +++ b/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch @@ -62,7 +62,7 @@ Signed-off-by: Felix Fietkau +MODULE_LICENSE("GPL"); --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -3051,6 +3051,7 @@ int wake_up_state(struct task_struct *p, +@@ -3049,6 +3049,7 @@ int wake_up_state(struct task_struct *p, { return try_to_wake_up(p, state, 0); } diff --git a/target/linux/lantiq/patches-5.10/0028-NET-lantiq-various-etop-fixes.patch b/target/linux/lantiq/patches-5.10/0028-NET-lantiq-various-etop-fixes.patch index 441aaed05..c3ec5d20f 100644 --- a/target/linux/lantiq/patches-5.10/0028-NET-lantiq-various-etop-fixes.patch +++ b/target/linux/lantiq/patches-5.10/0028-NET-lantiq-various-etop-fixes.patch @@ -745,7 +745,7 @@ Signed-off-by: John Crispin res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { -@@ -651,31 +860,64 @@ ltq_etop_probe(struct platform_device *p +@@ -651,31 +859,62 @@ ltq_etop_probe(struct platform_device *p goto err_out; } @@ -825,7 +825,7 @@ Signed-off-by: John Crispin err = register_netdev(dev); if (err) -@@ -704,31 +946,22 @@ ltq_etop_remove(struct platform_device * +@@ -704,31 +943,22 @@ ltq_etop_remove(struct platform_device * return 0; } diff --git a/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch b/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch index 381eaab5e..b82e174d2 100644 --- a/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch +++ b/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch @@ -19,7 +19,7 @@ }, [PORT_NPCM] = { .name = "Nuvoton 16550", -@@ -2712,6 +2712,11 @@ serial8250_do_set_termios(struct uart_po +@@ -2718,6 +2718,11 @@ serial8250_do_set_termios(struct uart_po unsigned long flags; unsigned int baud, quot, frac = 0; diff --git a/target/linux/octeon/patches-5.10/700-allocate_interface_by_label.patch b/target/linux/octeon/patches-5.10/700-allocate_interface_by_label.patch index 3a9b2eb7c..e4dc3f96e 100644 --- a/target/linux/octeon/patches-5.10/700-allocate_interface_by_label.patch +++ b/target/linux/octeon/patches-5.10/700-allocate_interface_by_label.patch @@ -12,21 +12,20 @@ Tested-by: Johannes Kimmel Signed-off-by: Roman Kuzmitskii --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c -@@ -408,9 +408,12 @@ int cvm_oct_common_init(struct net_devic +@@ -407,8 +407,12 @@ static int cvm_oct_common_set_mac_addres + int cvm_oct_common_init(struct net_device *dev) { struct octeon_ethernet *priv = netdev_priv(dev); - const u8 *mac = NULL; + const u8 *label = NULL; + int ret; -- if (priv->of_node) -+ if (priv->of_node) { - mac = of_get_mac_address(priv->of_node); ++ if (priv->of_node) + label = of_get_property(priv->of_node, "label", NULL); -+ } - - if (!IS_ERR_OR_NULL(mac)) - ether_addr_copy(dev->dev_addr, mac); -@@ -445,6 +448,9 @@ int cvm_oct_common_init(struct net_devic ++ + ret = of_get_mac_address(priv->of_node, dev->dev_addr); + if (ret) + eth_hw_addr_random(dev); +@@ -441,6 +445,9 @@ int cvm_oct_common_init(struct net_devic if (dev->netdev_ops->ndo_stop) dev->netdev_ops->ndo_stop(dev); diff --git a/target/linux/x86/patches-5.10/012-pcengines-apu2-detect-apuv4-board.patch b/target/linux/x86/patches-5.10/012-pcengines-apu2-detect-apuv4-board.patch index 989b91a69..520c66d29 100644 --- a/target/linux/x86/patches-5.10/012-pcengines-apu2-detect-apuv4-board.patch +++ b/target/linux/x86/patches-5.10/012-pcengines-apu2-detect-apuv4-board.patch @@ -14,7 +14,7 @@ Signed-off-by: Andy Shevchenko --- a/drivers/platform/x86/pcengines-apuv2.c +++ b/drivers/platform/x86/pcengines-apuv2.c -@@ -213,6 +213,33 @@ static const struct dmi_system_id apu_gp +@@ -215,6 +215,33 @@ static const struct dmi_system_id apu_gp }, .driver_data = (void *)&board_apu2, },