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 <therealgraysky@proton.me>
Link: https://github.com/openwrt/openwrt/pull/21904
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

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 540e3bf1c08f5c8e73ecdec86a9e93a21974618e..a077544061b07bc012724e41dce6fee166681b16 100644 (file)
--- 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 420c48475c82d3794814b6169806ac32ec2c4237..2e4247f47acb5945ac400b80b227a1ee0b6b39bf 100644 (file)
--- 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 d978fb9ea49a15961107617355218050f8c54354..37bf2fb81a513308c7451d0bf0a86ba6b47043f1 100644 (file)
--- 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 <phil@raspberrypi.com>
 
 --- 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 540e3bf1c08f5c8e73ecdec86a9e93a21974618e..a077544061b07bc012724e41dce6fee166681b16 100644 (file)
--- 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 872167bdfa25aca7eae2dc24636df8b88a47ccf2..c0c840d3af2a0d206f9cda6ddfbd9a6b885cb877 100644 (file)
--- 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 <kuba@kernel.org>
        { }
 --- 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 06b45a1a7124409dbcfe11f2bae935157efff6ef..465a0ae01858aa21c80dd84688b0227a7f9b2df3 100644 (file)
--- 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 <nbd@nbd.name>
        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 1be2869132ebc6c1da2607ce50109330a7323fc7..f938fad24a0c5b7b7e0ee2c8f57e5372d7d80711 100644 (file)
--- 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 2cf8cf159f6fb5b5e5c56ac18031036afbeafb58..4684e045d2deac846724260e763374525e5b0d17 100644 (file)
--- 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 <nbd@nbd.name>
 
 --- 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 1f4dfd210c205be89dfdfbc905ed3a0753532111..2a2ad000c2939de860f1d767c16741f27617bff7 100644 (file)
--- 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 <andersson@kernel.org>
 
 --- 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 bce782de4701542e3f76040397d8e5250315f4dd..7fc67f3ca7398e04ea222971b447e5b8d7793e46 100644 (file)
--- 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 <linus.walleij@linaro.org>
        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 <linus.walleij@linaro.org>
        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 <linus.walleij@linaro.org>
  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 38a171acffe9fcdfc0deb9bfad6e492ca2504713..2384ebe4c053c6c69985ec22bde0edbdcfc1c4bb 100644 (file)
--- 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 <bartosz.golaszewski@linaro.org>
 
 --- 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 d42b065117426be1b0be1df9cda0e868499d31ae..277d933e773559575a44aa1cc0dc7e68ee221f79 100644 (file)
--- 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 <bartosz.golaszewski@linaro.org>
 
 --- 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 <bartosz.golaszewski@linaro.org>
                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 a3a961bdd1ea82191de12c794ee6007377300aa8..614a7b3d2943ff52332c5e25563344111e1fe8d7 100644 (file)
--- 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 <bartosz.golaszewski@linaro.org>
 
 --- 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 <bartosz.golaszewski@linaro.org>
  
  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: