kernel: bump 6.6 to 6.6.115

Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.115

Patch manual updated:
- starfive/patches-6.6/0067-driver-uart-fix-up-uart-communicate-fail.patch [1]

All patches auto-refreshed.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.115&id=f354f7510ff0efaa1735093625749fc788ec67d1

Signed-off-by: Goetz Goerisch <ggoerisch@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/20598
(cherry picked from commit 6526d6d057edb3456420296c5640a63e95198d92)
Signed-off-by: Goetz Goerisch <ggoerisch@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/20701
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/include/kernel-6.6 b/include/kernel-6.6
index fac976bfec786bb4a5ec2c8e9c25f8d8b4f62dfe..706c50ef7bcc4ddf3ae28e8267a38fc8d37e4e3e 100644 (file)
--- a/include/kernel-6.6
+++ b/include/kernel-6.6
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.6 = .114
-LINUX_KERNEL_HASH-6.6.114 = ca4175a03ce2943ae192d77ad91e37ee292f1f1bb7b2954b062b0ef7eb0cb97c
+LINUX_VERSION-6.6 = .115
+LINUX_KERNEL_HASH-6.6.115 = 0a98c05e8d0f6b49fad71b8d779410a0811ea5ae17d81744fe30718633fd9047

diff --git a/target/linux/bcm27xx/patches-6.6/950-0420-hwmon-sht3x-Add-DT-compatible-string.patch b/target/linux/bcm27xx/patches-6.6/950-0420-hwmon-sht3x-Add-DT-compatible-string.patch
index c559e39fab9ae917e4e9472a18786b61b793e0c4..758a5d19bc178bd58ac1d6e062f9b25d218f08b9 100644 (file)
--- a/target/linux/bcm27xx/patches-6.6/950-0420-hwmon-sht3x-Add-DT-compatible-string.patch
+++ b/target/linux/bcm27xx/patches-6.6/950-0420-hwmon-sht3x-Add-DT-compatible-string.patch
@@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 
 --- a/drivers/hwmon/sht3x.c
 +++ b/drivers/hwmon/sht3x.c
-@@ -911,8 +911,18 @@ static int sht3x_probe(struct i2c_client
+@@ -918,8 +918,18 @@ static int sht3x_probe(struct i2c_client
        return PTR_ERR_OR_ZERO(hwmon_dev);
  }
  

diff --git a/target/linux/generic/hack-6.6/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-6.6/780-usb-net-MeigLink_modem_support.patch
index e0d578994716cd01bc8c01f56c0a000556871367..9d389dd3fca15d43d58f98414a33c920aadf671b 100644 (file)
--- a/target/linux/generic/hack-6.6/780-usb-net-MeigLink_modem_support.patch
+++ b/target/linux/generic/hack-6.6/780-usb-net-MeigLink_modem_support.patch
@@ -44,7 +44,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
  
  #define QUECTEL_VENDOR_ID                     0x2c7c
  /* These Quectel products use Quectel's vendor ID */
-@@ -1154,6 +1159,11 @@ static const struct usb_device_id option
+@@ -1156,6 +1161,11 @@ static const struct usb_device_id option
        { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
        { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */
          .driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) },
@@ -56,7 +56,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
        /* Quectel products using Qualcomm vendor ID */
        { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},
        { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),
-@@ -1195,6 +1205,11 @@ static const struct usb_device_id option
+@@ -1197,6 +1207,11 @@ static const struct usb_device_id option
          .driver_info = ZLP },
        { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
          .driver_info = RSVD(4) },

diff --git a/target/linux/generic/pending-6.6/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch b/target/linux/generic/pending-6.6/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
index d62ccc571ce8989732b663e5a4d298f2df7c509a..31e29c447e8ade807a4daf28a2ae21e44706686b 100644 (file)
--- a/target/linux/generic/pending-6.6/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
+++ b/target/linux/generic/pending-6.6/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
@@ -161,7 +161,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  struct rtnl_link {
        rtnl_doit_func          doit;
-@@ -4981,7 +4981,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
+@@ -4978,7 +4978,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
            brport_nla_put_flag(skb, flags, mask,
                                IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||
            brport_nla_put_flag(skb, flags, mask,

diff --git a/target/linux/starfive/patches-6.6/0067-driver-uart-fix-up-uart-communicate-fail.patch b/target/linux/starfive/patches-6.6/0067-driver-uart-fix-up-uart-communicate-fail.patch
index 18d735b92d9aa305d81677f5fe699a4dce0bd174..e36b8fd57e9a30d8bc8fa891f181740ef5749940 100644 (file)
--- a/target/linux/starfive/patches-6.6/0067-driver-uart-fix-up-uart-communicate-fail.patch
+++ b/target/linux/starfive/patches-6.6/0067-driver-uart-fix-up-uart-communicate-fail.patch
@@ -24,6 +24,6 @@ Signed-off-by: shanlong.li <shanlong.li@starfivetech.com>
 +      if (IS_ERR(data->rst)) {
 +              err = PTR_ERR(data->rst);
 +      }
-       reset_control_deassert(data->rst);
- 
-       err = devm_add_action_or_reset(dev, dw8250_reset_control_assert, data->rst);
+       err = reset_control_deassert(data->rst);
+       if (err)
+               return dev_err_probe(dev, err, "failed to deassert resets\n");

diff --git a/target/linux/starfive/patches-6.6/0068-uart-8250-add-reset-operation-in-runtime-PM.patch b/target/linux/starfive/patches-6.6/0068-uart-8250-add-reset-operation-in-runtime-PM.patch
index 56efebda6cae29ba2b58397781e5cc43206a9c4d..8f27dba5aa01793e3c2b7c4bde40cb801e903494 100644 (file)
--- a/target/linux/starfive/patches-6.6/0068-uart-8250-add-reset-operation-in-runtime-PM.patch
+++ b/target/linux/starfive/patches-6.6/0068-uart-8250-add-reset-operation-in-runtime-PM.patch
@@ -12,7 +12,7 @@ Signed-off-by: William Qiu <william.qiu@starfivetech.com>
 
 --- a/drivers/tty/serial/8250/8250_dw.c
 +++ b/drivers/tty/serial/8250/8250_dw.c
-@@ -745,6 +745,8 @@ static int dw8250_runtime_suspend(struct
+@@ -747,6 +747,8 @@ static int dw8250_runtime_suspend(struct
  {
        struct dw8250_data *data = dev_get_drvdata(dev);
  
@@ -21,7 +21,7 @@ Signed-off-by: William Qiu <william.qiu@starfivetech.com>
        clk_disable_unprepare(data->clk);
  
        clk_disable_unprepare(data->pclk);
-@@ -760,6 +762,8 @@ static int dw8250_runtime_resume(struct
+@@ -762,6 +764,8 @@ static int dw8250_runtime_resume(struct
  
        clk_prepare_enable(data->clk);
  

diff --git a/target/linux/starfive/patches-6.6/1000-serial-8250_dw-Add-starfive-jh7100-hsuart-compatible.patch b/target/linux/starfive/patches-6.6/1000-serial-8250_dw-Add-starfive-jh7100-hsuart-compatible.patch
index a094e4b5d6918770af9eaceefa3654ca726b8b33..eec64fb6fed9de7347f05ab0c6e169b432658187 100644 (file)
--- a/target/linux/starfive/patches-6.6/1000-serial-8250_dw-Add-starfive-jh7100-hsuart-compatible.patch
+++ b/target/linux/starfive/patches-6.6/1000-serial-8250_dw-Add-starfive-jh7100-hsuart-compatible.patch
@@ -15,7 +15,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
 
 --- a/drivers/tty/serial/8250/8250_dw.c
 +++ b/drivers/tty/serial/8250/8250_dw.c
-@@ -803,6 +803,7 @@ static const struct of_device_id dw8250_
+@@ -805,6 +805,7 @@ static const struct of_device_id dw8250_
        { .compatible = "marvell,armada-38x-uart", .data = &dw8250_armada_38x_data },
        { .compatible = "renesas,rzn1-uart", .data = &dw8250_renesas_rzn1_data },
        { .compatible = "sophgo,sg2044-uart", .data = &dw8250_skip_set_rate_data },