From: John Audia Date: Fri, 6 Feb 2026 19:54:35 +0000 (-0500) Subject: kernel: bump 6.12 to 6.12.69 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b4759469c99ba2cd66a36b3d90daf42bfa007073;p=openwrt%2Fopenwrt.git kernel: bump 6.12 to 6.12.69 Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.69 All patches automatically rebased. Build system: x86/64 Build-tested: flogic/glinet_gl-mt6000 Run-tested: flogic/glinet_gl-mt6000 Signed-off-by: John Audia Link: https://github.com/openwrt/openwrt/pull/21904 Signed-off-by: Hauke Mehrtens --- diff --git a/target/linux/airoha/patches-6.12/901-snand-mtk-bmt-support.patch b/target/linux/airoha/patches-6.12/901-snand-mtk-bmt-support.patch index 540e3bf1c0..a077544061 100644 --- a/target/linux/airoha/patches-6.12/901-snand-mtk-bmt-support.patch +++ b/target/linux/airoha/patches-6.12/901-snand-mtk-bmt-support.patch @@ -8,7 +8,7 @@ static int spinand_read_reg_op(struct spinand_device *spinand, u8 reg, u8 *val) { -@@ -1577,6 +1578,7 @@ static int spinand_probe(struct spi_mem +@@ -1596,6 +1597,7 @@ static int spinand_probe(struct spi_mem if (ret) return ret; @@ -16,7 +16,7 @@ ret = mtd_device_register(mtd, NULL, 0); if (ret) goto err_spinand_cleanup; -@@ -1584,6 +1586,7 @@ static int spinand_probe(struct spi_mem +@@ -1603,6 +1605,7 @@ static int spinand_probe(struct spi_mem return 0; err_spinand_cleanup: @@ -24,7 +24,7 @@ spinand_cleanup(spinand); return ret; -@@ -1602,6 +1605,7 @@ static int spinand_remove(struct spi_mem +@@ -1621,6 +1624,7 @@ static int spinand_remove(struct spi_mem if (ret) return ret; diff --git a/target/linux/ath79/patches-6.12/900-unaligned_access_hacks.patch b/target/linux/ath79/patches-6.12/900-unaligned_access_hacks.patch index 420c48475c..2e4247f47a 100644 --- a/target/linux/ath79/patches-6.12/900-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-6.12/900-unaligned_access_hacks.patch @@ -866,7 +866,7 @@ SVN-Revision: 35130 iph->daddr == iph2->daddr && iph->saddr == iph2->saddr) return segs; -@@ -267,7 +267,7 @@ struct sk_buff *tcp_gro_lookup(struct li +@@ -268,7 +268,7 @@ struct sk_buff *tcp_gro_lookup(struct li continue; th2 = tcp_hdr(p); @@ -875,7 +875,7 @@ SVN-Revision: 35130 NAPI_GRO_CB(p)->same_flow = 0; continue; } -@@ -331,8 +331,8 @@ struct sk_buff *tcp_gro_receive(struct l +@@ -332,8 +332,8 @@ struct sk_buff *tcp_gro_receive(struct l ~(TCP_FLAG_CWR | TCP_FLAG_FIN | TCP_FLAG_PSH)); flush |= (__force int)(th->ack_seq ^ th2->ack_seq); for (i = sizeof(*th); i < thlen; i += 4) diff --git a/target/linux/bcm27xx/patches-6.12/950-0308-gpio-pca953x-Add-ti-tca9554-compatible-string.patch b/target/linux/bcm27xx/patches-6.12/950-0308-gpio-pca953x-Add-ti-tca9554-compatible-string.patch index d978fb9ea4..37bf2fb81a 100644 --- a/target/linux/bcm27xx/patches-6.12/950-0308-gpio-pca953x-Add-ti-tca9554-compatible-string.patch +++ b/target/linux/bcm27xx/patches-6.12/950-0308-gpio-pca953x-Add-ti-tca9554-compatible-string.patch @@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c -@@ -1351,6 +1351,7 @@ static const struct of_device_id pca953x +@@ -1353,6 +1353,7 @@ static const struct of_device_id pca953x { .compatible = "ti,tca9535", .data = OF_953X(16, PCA_INT), }, { .compatible = "ti,tca9538", .data = OF_953X( 8, PCA_INT), }, { .compatible = "ti,tca9539", .data = OF_953X(16, PCA_INT), }, diff --git a/target/linux/econet/patches-6.12/902-snand-mtk-bmt-support.patch b/target/linux/econet/patches-6.12/902-snand-mtk-bmt-support.patch index 540e3bf1c0..a077544061 100644 --- a/target/linux/econet/patches-6.12/902-snand-mtk-bmt-support.patch +++ b/target/linux/econet/patches-6.12/902-snand-mtk-bmt-support.patch @@ -8,7 +8,7 @@ static int spinand_read_reg_op(struct spinand_device *spinand, u8 reg, u8 *val) { -@@ -1577,6 +1578,7 @@ static int spinand_probe(struct spi_mem +@@ -1596,6 +1597,7 @@ static int spinand_probe(struct spi_mem if (ret) return ret; @@ -16,7 +16,7 @@ ret = mtd_device_register(mtd, NULL, 0); if (ret) goto err_spinand_cleanup; -@@ -1584,6 +1586,7 @@ static int spinand_probe(struct spi_mem +@@ -1603,6 +1605,7 @@ static int spinand_probe(struct spi_mem return 0; err_spinand_cleanup: @@ -24,7 +24,7 @@ spinand_cleanup(spinand); return ret; -@@ -1602,6 +1605,7 @@ static int spinand_remove(struct spi_mem +@@ -1621,6 +1624,7 @@ static int spinand_remove(struct spi_mem if (ret) return ret; diff --git a/target/linux/generic/backport-6.12/720-09-v6.14-net-phy-Constify-struct-mdio_device_id.patch b/target/linux/generic/backport-6.12/720-09-v6.14-net-phy-Constify-struct-mdio_device_id.patch index 872167bdfa..c0c840d3af 100644 --- a/target/linux/generic/backport-6.12/720-09-v6.14-net-phy-Constify-struct-mdio_device_id.patch +++ b/target/linux/generic/backport-6.12/720-09-v6.14-net-phy-Constify-struct-mdio_device_id.patch @@ -458,7 +458,7 @@ Signed-off-by: Jakub Kicinski { } --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c -@@ -5826,7 +5826,7 @@ MODULE_DESCRIPTION("Micrel PHY driver"); +@@ -5835,7 +5835,7 @@ MODULE_DESCRIPTION("Micrel PHY driver"); MODULE_AUTHOR("David J. Choi"); MODULE_LICENSE("GPL"); diff --git a/target/linux/generic/hack-6.12/902-debloat_proc.patch b/target/linux/generic/hack-6.12/902-debloat_proc.patch index 06b45a1a71..465a0ae018 100644 --- a/target/linux/generic/hack-6.12/902-debloat_proc.patch +++ b/target/linux/generic/hack-6.12/902-debloat_proc.patch @@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau if (!pe) --- a/mm/vmalloc.c +++ b/mm/vmalloc.c -@@ -5074,6 +5074,9 @@ static int vmalloc_info_show(struct seq_ +@@ -5071,6 +5071,9 @@ static int vmalloc_info_show(struct seq_ static int __init proc_vmalloc_init(void) { diff --git a/target/linux/generic/kernel-6.12 b/target/linux/generic/kernel-6.12 index 1be2869132..f938fad24a 100644 --- a/target/linux/generic/kernel-6.12 +++ b/target/linux/generic/kernel-6.12 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.12 = .68 -LINUX_KERNEL_HASH-6.12.68 = d367c7504bd4da520dd01eb08125d2d0ac088bc8af4cd56d236f2074dd4225b7 +LINUX_VERSION-6.12 = .69 +LINUX_KERNEL_HASH-6.12.69 = 4b493657f218703239c4f22415f027b3644949bf2761abd18b849f0aad5f7665 diff --git a/target/linux/generic/pending-6.12/690-net-add-missing-check-for-TCP-fraglist-GRO.patch b/target/linux/generic/pending-6.12/690-net-add-missing-check-for-TCP-fraglist-GRO.patch index 2cf8cf159f..4684e045d2 100644 --- a/target/linux/generic/pending-6.12/690-net-add-missing-check-for-TCP-fraglist-GRO.patch +++ b/target/linux/generic/pending-6.12/690-net-add-missing-check-for-TCP-fraglist-GRO.patch @@ -16,7 +16,7 @@ Signed-off-by: Felix Fietkau --- a/net/ipv4/tcp_offload.c +++ b/net/ipv4/tcp_offload.c -@@ -354,6 +354,7 @@ struct sk_buff *tcp_gro_receive(struct l +@@ -355,6 +355,7 @@ struct sk_buff *tcp_gro_receive(struct l flush |= (__force int)(flags ^ tcp_flag_word(th2)); flush |= skb->ip_summed != p->ip_summed; flush |= skb->csum_level != p->csum_level; diff --git a/target/linux/qualcommbe/patches-6.12/0022-v6.15-arm64-defconfig-Build-NSS-Clock-Controller-dri.patch b/target/linux/qualcommbe/patches-6.12/0022-v6.15-arm64-defconfig-Build-NSS-Clock-Controller-dri.patch index 1f4dfd210c..2a2ad000c2 100644 --- a/target/linux/qualcommbe/patches-6.12/0022-v6.15-arm64-defconfig-Build-NSS-Clock-Controller-dri.patch +++ b/target/linux/qualcommbe/patches-6.12/0022-v6.15-arm64-defconfig-Build-NSS-Clock-Controller-dri.patch @@ -19,7 +19,7 @@ Signed-off-by: Bjorn Andersson --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig -@@ -1313,6 +1313,7 @@ CONFIG_IPQ_GCC_5332=y +@@ -1312,6 +1312,7 @@ CONFIG_IPQ_GCC_5332=y CONFIG_IPQ_GCC_6018=y CONFIG_IPQ_GCC_8074=y CONFIG_IPQ_GCC_9574=y diff --git a/target/linux/rockchip/patches-6.12/032-22-v6.15-pinctrl-rockchip-Add-support-for-RK3528.patch b/target/linux/rockchip/patches-6.12/032-22-v6.15-pinctrl-rockchip-Add-support-for-RK3528.patch index bce782de47..7fc67f3ca7 100644 --- a/target/linux/rockchip/patches-6.12/032-22-v6.15-pinctrl-rockchip-Add-support-for-RK3528.patch +++ b/target/linux/rockchip/patches-6.12/032-22-v6.15-pinctrl-rockchip-Add-support-for-RK3528.patch @@ -159,7 +159,7 @@ Signed-off-by: Linus Walleij case RK3568: case RK3576: case RK3588: -@@ -2965,6 +3077,7 @@ static bool rockchip_pinconf_pull_valid( +@@ -2964,6 +3076,7 @@ static bool rockchip_pinconf_pull_valid( case RK3328: case RK3368: case RK3399: @@ -167,7 +167,7 @@ Signed-off-by: Linus Walleij case RK3568: case RK3576: case RK3588: -@@ -4084,6 +4197,49 @@ static struct rockchip_pin_ctrl rk3399_p +@@ -4083,6 +4196,49 @@ static struct rockchip_pin_ctrl rk3399_p .drv_calc_reg = rk3399_calc_drv_reg_and_bit, }; @@ -217,7 +217,7 @@ Signed-off-by: Linus Walleij static struct rockchip_pin_bank rk3568_pin_banks[] = { PIN_BANK_IOMUX_FLAGS(0, 32, "gpio0", IOMUX_SOURCE_PMU | IOMUX_WIDTH_4BIT, IOMUX_SOURCE_PMU | IOMUX_WIDTH_4BIT, -@@ -4208,6 +4364,8 @@ static const struct of_device_id rockchi +@@ -4207,6 +4363,8 @@ static const struct of_device_id rockchi .data = &rk3368_pin_ctrl }, { .compatible = "rockchip,rk3399-pinctrl", .data = &rk3399_pin_ctrl }, diff --git a/target/linux/rockchip/patches-6.12/035-01-v6.13-gpio-rockchip-explan-the-format-of-the-GPIO-version-ID.patch b/target/linux/rockchip/patches-6.12/035-01-v6.13-gpio-rockchip-explan-the-format-of-the-GPIO-version-ID.patch index 38a171acff..2384ebe4c0 100644 --- a/target/linux/rockchip/patches-6.12/035-01-v6.13-gpio-rockchip-explan-the-format-of-the-GPIO-version-ID.patch +++ b/target/linux/rockchip/patches-6.12/035-01-v6.13-gpio-rockchip-explan-the-format-of-the-GPIO-version-ID.patch @@ -17,7 +17,7 @@ Signed-off-by: Bartosz Golaszewski --- a/drivers/gpio/gpio-rockchip.c +++ b/drivers/gpio/gpio-rockchip.c -@@ -26,9 +26,15 @@ +@@ -25,9 +25,15 @@ #include "../pinctrl/core.h" #include "../pinctrl/pinctrl-rockchip.h" diff --git a/target/linux/rockchip/patches-6.12/035-02-v6.13-gpio-rockchip-change-the-GPIO-version-judgment-logic.patch b/target/linux/rockchip/patches-6.12/035-02-v6.13-gpio-rockchip-change-the-GPIO-version-judgment-logic.patch index d42b065117..277d933e77 100644 --- a/target/linux/rockchip/patches-6.12/035-02-v6.13-gpio-rockchip-change-the-GPIO-version-judgment-logic.patch +++ b/target/linux/rockchip/patches-6.12/035-02-v6.13-gpio-rockchip-change-the-GPIO-version-judgment-logic.patch @@ -16,7 +16,7 @@ Signed-off-by: Bartosz Golaszewski --- a/drivers/gpio/gpio-rockchip.c +++ b/drivers/gpio/gpio-rockchip.c -@@ -668,8 +668,9 @@ static int rockchip_get_bank_data(struct +@@ -660,8 +660,9 @@ static int rockchip_get_bank_data(struct clk_prepare_enable(bank->clk); id = readl(bank->reg_base + gpio_regs_v2.version_id); @@ -28,7 +28,7 @@ Signed-off-by: Bartosz Golaszewski bank->gpio_regs = &gpio_regs_v2; bank->gpio_type = GPIO_TYPE_V2; bank->db_clk = of_clk_get(bank->of_node, 1); -@@ -678,9 +679,14 @@ static int rockchip_get_bank_data(struct +@@ -670,9 +671,14 @@ static int rockchip_get_bank_data(struct clk_disable_unprepare(bank->clk); return -EINVAL; } diff --git a/target/linux/rockchip/patches-6.12/035-03-v6.13-gpio-rockchip-support-new-version-GPIO.patch b/target/linux/rockchip/patches-6.12/035-03-v6.13-gpio-rockchip-support-new-version-GPIO.patch index a3a961bdd1..614a7b3d29 100644 --- a/target/linux/rockchip/patches-6.12/035-03-v6.13-gpio-rockchip-support-new-version-GPIO.patch +++ b/target/linux/rockchip/patches-6.12/035-03-v6.13-gpio-rockchip-support-new-version-GPIO.patch @@ -16,7 +16,7 @@ Signed-off-by: Bartosz Golaszewski --- a/drivers/gpio/gpio-rockchip.c +++ b/drivers/gpio/gpio-rockchip.c -@@ -35,6 +35,7 @@ +@@ -34,6 +34,7 @@ #define GPIO_TYPE_V1 (0) /* GPIO Version ID reserved */ #define GPIO_TYPE_V2 (0x01000C2B) #define GPIO_TYPE_V2_1 (0x0101157C) @@ -24,7 +24,7 @@ Signed-off-by: Bartosz Golaszewski static const struct rockchip_gpio_regs gpio_regs_v1 = { .port_dr = 0x00, -@@ -671,6 +672,7 @@ static int rockchip_get_bank_data(struct +@@ -663,6 +664,7 @@ static int rockchip_get_bank_data(struct switch (id) { case GPIO_TYPE_V2: case GPIO_TYPE_V2_1: