From: John Audia Date: Mon, 1 Jun 2026 19:56:59 +0000 (-0400) Subject: kernel: bump 6.18 to 6.18.34 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=94f3f9a845e81f8ec6fefe75ee6f452acbc93f2d;p=thirdparty%2Fopenwrt.git kernel: bump 6.18 to 6.18.34 Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.18.34 Removed upstreamed: backport-6.18/627-v7.1-net-pse-pd-fix-sign-on-ENOENT-check-in-of_load_pse_p.patch[1] ath79/patches-6.18/301-irqchip-irq-ath79-cpu-drop-OF-init-helper.patch[2] ipq40xx/patches-6.18/708-pinctrl-qcom-ipq4019-mark-gpio-as-a-GPIO-pin-function.patch[3] All other patches automatically rebased via update_kernel.sh 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.18.34&id=dac025c4e8f9c5cf9467eeac8be4639469aa5ac5 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.18.34&id=617a2564d8634c06d19097dc0f89bd3a72bcb1b4 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.18.34&id=00aca89f5e3453b30b73e31aa31099b1433f8370 Build system: x86/64 Build-tested: x86/64-glibc Run-tested: x86/64-glibc Signed-off-by: John Audia Link: https://github.com/openwrt/openwrt/pull/23618 Signed-off-by: Jonas Jelonek --- diff --git a/target/linux/ath79/patches-6.18/301-irqchip-irq-ath79-cpu-drop-OF-init-helper.patch b/target/linux/ath79/patches-6.18/301-irqchip-irq-ath79-cpu-drop-OF-init-helper.patch deleted file mode 100644 index 13117d9a8e6..00000000000 --- a/target/linux/ath79/patches-6.18/301-irqchip-irq-ath79-cpu-drop-OF-init-helper.patch +++ /dev/null @@ -1,23 +0,0 @@ -From e029f998594f151008ecbfa024e2957edd2a5189 Mon Sep 17 00:00:00 2001 -From: John Crispin -Date: Tue, 6 Mar 2018 09:58:19 +0100 -Subject: [PATCH 08/33] irqchip/irq-ath79-cpu: drop !OF init helper - -Signed-off-by: John Crispin ---- - drivers/irqchip/irq-ath79-cpu.c | 7 ------- - 1 file changed, 7 deletions(-) - ---- a/drivers/irqchip/irq-ath79-cpu.c -+++ b/drivers/irqchip/irq-ath79-cpu.c -@@ -85,10 +85,3 @@ static int __init ar79_cpu_intc_of_init( - } - IRQCHIP_DECLARE(ar79_cpu_intc, "qca,ar7100-cpu-intc", - ar79_cpu_intc_of_init); -- --void __init ath79_cpu_irq_init(unsigned irq_wb_chan2, unsigned irq_wb_chan3) --{ -- irq_wb_chan[2] = irq_wb_chan2; -- irq_wb_chan[3] = irq_wb_chan3; -- mips_cpu_irq_init(); --} diff --git a/target/linux/ath79/patches-6.18/900-unaligned_access_hacks.patch b/target/linux/ath79/patches-6.18/900-unaligned_access_hacks.patch index dac36419a73..1e6471aee9e 100644 --- a/target/linux/ath79/patches-6.18/900-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-6.18/900-unaligned_access_hacks.patch @@ -312,7 +312,7 @@ SVN-Revision: 35130 case IPV6_2292HOPOPTS: --- a/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c -@@ -991,7 +991,7 @@ static bool ipv6_hop_jumbo(struct sk_buf +@@ -1002,7 +1002,7 @@ static bool ipv6_hop_jumbo(struct sk_buf goto drop; } diff --git a/target/linux/generic/backport-6.18/627-v7.1-net-pse-pd-fix-sign-on-ENOENT-check-in-of_load_pse_p.patch b/target/linux/generic/backport-6.18/627-v7.1-net-pse-pd-fix-sign-on-ENOENT-check-in-of_load_pse_p.patch deleted file mode 100644 index 2ef6d586613..00000000000 --- a/target/linux/generic/backport-6.18/627-v7.1-net-pse-pd-fix-sign-on-ENOENT-check-in-of_load_pse_p.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 33d35975cbead3fa6b738ee57e5e45e14fbe0886 Mon Sep 17 00:00:00 2001 -From: Jonas Jelonek -Date: Fri, 15 May 2026 14:31:03 +0000 -Subject: [PATCH] net: pse-pd: fix sign on -ENOENT check in of_load_pse_pis() - -of_count_phandle_with_args() returns the count on success and a negative -errno on failure, including -ENOENT when the "pairsets" property is -absent. The existing comparison in of_load_pse_pis() checks against -ENOENT (positive 2) instead of -ENOENT, so the branch is taken for any -error return: legitimate DTs that omit "pairsets" trigger a spurious -"wrong number of pairsets" error and probe fails with -EINVAL. - -Compare against -ENOENT so a missing "pairsets" property is correctly -treated as "this PI has no pairsets, continue". - -Fixes: 9be9567a7c59 ("net: pse-pd: Add support for PSE PIs") -Cc: stable@vger.kernel.org -Signed-off-by: Jonas Jelonek -Acked-by: Oleksij Rempel -Link: https://patch.msgid.link/20260515143103.1721888-1-jelonek.jonas@gmail.com -Signed-off-by: Jakub Kicinski - ---- a/drivers/net/pse-pd/pse_core.c -+++ b/drivers/net/pse-pd/pse_core.c -@@ -210,7 +210,7 @@ static int of_load_pse_pis(struct pse_co - ret = of_load_pse_pi_pairsets(node, &pi, ret); - if (ret) - goto out; -- } else if (ret != ENOENT) { -+ } else if (ret != -ENOENT) { - dev_err(pcdev->dev, - "error: wrong number of pairsets. Should be 1 or 2, got %d (%pOF)\n", - ret, node); diff --git a/target/linux/generic/backport-6.18/821-02-v7.0-gpio-add-gpio-line-mux-driver.patch b/target/linux/generic/backport-6.18/821-02-v7.0-gpio-add-gpio-line-mux-driver.patch index 691788fb06a..5bce83d31be 100644 --- a/target/linux/generic/backport-6.18/821-02-v7.0-gpio-add-gpio-line-mux-driver.patch +++ b/target/linux/generic/backport-6.18/821-02-v7.0-gpio-add-gpio-line-mux-driver.patch @@ -52,7 +52,7 @@ Signed-off-by: Bartosz Golaszewski L: linux-gpio@vger.kernel.org --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig -@@ -1985,6 +1985,15 @@ config GPIO_LATCH +@@ -1984,6 +1984,15 @@ config GPIO_LATCH Say yes here to enable a driver for GPIO multiplexers based on latches connected to other GPIOs. diff --git a/target/linux/generic/kernel-6.18 b/target/linux/generic/kernel-6.18 index d2dcb5eb41d..ccd85ab5bbb 100644 --- a/target/linux/generic/kernel-6.18 +++ b/target/linux/generic/kernel-6.18 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.18 = .33 -LINUX_KERNEL_HASH-6.18.33 = 6f16ff302599f6fe34742890322cf0775703105fbd8767449682fca6af0fb782 +LINUX_VERSION-6.18 = .34 +LINUX_KERNEL_HASH-6.18.34 = 640c4732fb42842166db97e032c1fe7e5ff72c85a8982c75b40f74be3555d760 diff --git a/target/linux/generic/pending-6.18/834-ledtrig-libata.patch b/target/linux/generic/pending-6.18/834-ledtrig-libata.patch index e2954e3bb75..3b21467f93e 100644 --- a/target/linux/generic/pending-6.18/834-ledtrig-libata.patch +++ b/target/linux/generic/pending-6.18/834-ledtrig-libata.patch @@ -132,7 +132,7 @@ Signed-off-by: Daniel Golle /* * Define if arch has non-standard setup. This is a _PCI_ standard -@@ -939,6 +942,10 @@ struct ata_port { +@@ -940,6 +943,10 @@ struct ata_port { #ifdef CONFIG_ATA_ACPI struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */ #endif diff --git a/target/linux/ipq40xx/patches-6.18/708-pinctrl-qcom-ipq4019-mark-gpio-as-a-GPIO-pin-function.patch b/target/linux/ipq40xx/patches-6.18/708-pinctrl-qcom-ipq4019-mark-gpio-as-a-GPIO-pin-function.patch deleted file mode 100644 index 762aa46ac22..00000000000 --- a/target/linux/ipq40xx/patches-6.18/708-pinctrl-qcom-ipq4019-mark-gpio-as-a-GPIO-pin-function.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 437579ad9804055132ad40ccc1ba0cc64dbd828b Mon Sep 17 00:00:00 2001 -From: Til Kaiser -Date: Mon, 13 Apr 2026 10:29:20 +0200 -Subject: [PATCH] pinctrl: qcom: ipq4019: mark gpio as a GPIO pin function - -The qcom pinctrl core supports marking functions that represent GPIO mode -via PINCTRL_GPIO_PINFUNCTION(), so that strict pinmuxing does not reject -GPIO requests for pins that are muxed to the GPIO function. - -ipq4019 still describes its gpio function with QCA_PIN_FUNCTION(gpio), -so it is not treated as a GPIO pin function. As a result, GPIO consumers -can still conflict with pinctrl states that select the "gpio" function. - -Add a QCA_GPIO_PIN_FUNCTION() helper and use it for the ipq4019 gpio -function, matching how the msm-based qcom drivers handle this. - -This allows ipq4019 to keep the GPIO-related pin configuration in DTS -without tripping over strict pinmux ownership checks. - -Fixes: cc85cb96e2e4 ("pinctrl: qcom: make the pinmuxing strict") -Signed-off-by: Til Kaiser ---- - drivers/pinctrl/qcom/pinctrl-ipq4019.c | 2 +- - drivers/pinctrl/qcom/pinctrl-msm.h | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - ---- a/drivers/pinctrl/qcom/pinctrl-ipq4019.c -+++ b/drivers/pinctrl/qcom/pinctrl-ipq4019.c -@@ -480,7 +480,7 @@ static const struct pinfunction ipq4019_ - QCA_PIN_FUNCTION(blsp_uart0), - QCA_PIN_FUNCTION(blsp_uart1), - QCA_PIN_FUNCTION(chip_rst), -- QCA_PIN_FUNCTION(gpio), -+ QCA_GPIO_PIN_FUNCTION(gpio), - QCA_PIN_FUNCTION(i2s_rx), - QCA_PIN_FUNCTION(i2s_spdif_in), - QCA_PIN_FUNCTION(i2s_spdif_out), ---- a/drivers/pinctrl/qcom/pinctrl-msm.h -+++ b/drivers/pinctrl/qcom/pinctrl-msm.h -@@ -39,6 +39,11 @@ struct pinctrl_pin_desc; - fname##_groups, \ - ARRAY_SIZE(fname##_groups)) - -+#define QCA_GPIO_PIN_FUNCTION(fname) \ -+ [qca_mux_##fname] = PINCTRL_GPIO_PINFUNCTION(#fname, \ -+ fname##_groups, \ -+ ARRAY_SIZE(fname##_groups)) -+ - /** - * struct msm_pingroup - Qualcomm pingroup definition - * @grp: Generic data of the pin group (name and pins)