projects / openwrt / staging / blocktrron.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7788624)
kernel: bump 6.1 to 6.1.108
authorZxl hhyccc <zxlhhy@gmail.com>
Wed, 4 Sep 2024 12:43:31 +0000 (20:43 +0800)
committerHauke Mehrtens <hauke@hauke-m.de>
Fri, 6 Sep 2024 20:38:55 +0000 (22:38 +0200)
https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.108

All patches automatically rebased.

Build system: bcm53xx octeon

Signed-off-by: Zxl hhyccc <zxlhhy@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16325
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
include/kernel-6.1 patch | blob | history
target/linux/generic/backport-6.1/827-v6.3-0001-of-base-add-of_parse_phandle_with_optional_args.patch patch | blob | history
target/linux/generic/backport-6.1/828-v6.4-0003-of-Rename-of_modalias_node.patch patch | blob | history
target/linux/generic/backport-6.1/828-v6.4-0004-of-Move-of_modalias-to-module.c.patch patch | blob | history
target/linux/generic/backport-6.1/828-v6.4-0005-of-Move-the-request-module-helper-logic-to-module.c.patch patch | blob | history
target/linux/generic/backport-6.1/894-v6.8-net-ethtool-implement-ethtool_puts.patch patch | blob | history
target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch patch | blob | history
target/linux/generic/pending-6.1/834-ledtrig-libata.patch patch | blob | history

diff --git a/include/kernel-6.1 b/include/kernel-6.1
index 0e0d2702f201cf7793c9e7b9a6bdf03128a5b6c2..3f35a9241874c44e8de8088203e8461819f6acba 100644 (file)
--- a/include/kernel-6.1
+++ b/include/kernel-6.1
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .107
-LINUX_KERNEL_HASH-6.1.107 = f43229d1d73011fa0a37400320a26972946f8ff295c404c31c0dd0407228b0e8
+LINUX_VERSION-6.1 = .108
+LINUX_KERNEL_HASH-6.1.108 = 3f4e4e89a00e221a6dd1174779e0028794f44f4624ad6a31c79f3b7796688ca2
diff --git a/target/linux/generic/backport-6.1/827-v6.3-0001-of-base-add-of_parse_phandle_with_optional_args.patch b/target/linux/generic/backport-6.1/827-v6.3-0001-of-base-add-of_parse_phandle_with_optional_args.patch
index f568c3f6ce5886a1f89b7d4f5ea43c00b5254d47..b4cb96d24832ef155b89ce5bd9825a247ccab776 100644 (file)
--- a/target/linux/generic/backport-6.1/827-v6.3-0001-of-base-add-of_parse_phandle_with_optional_args.patch
+++ b/target/linux/generic/backport-6.1/827-v6.3-0001-of-base-add-of_parse_phandle_with_optional_args.patch
@@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/include/linux/of.h
 +++ b/include/linux/of.h
-@@ -1009,6 +1009,31 @@ static inline int of_parse_phandle_with_
+@@ -1011,6 +1011,31 @@ static inline int of_parse_phandle_with_
  }
  
  /**
diff --git a/target/linux/generic/backport-6.1/828-v6.4-0003-of-Rename-of_modalias_node.patch b/target/linux/generic/backport-6.1/828-v6.4-0003-of-Rename-of_modalias_node.patch
index c11ccc6c3e028048db29c1ed363f1dba5fd6af81..69d316b8fa3ce7f862728afbc173a23ca7fd3ac1 100644 (file)
--- a/target/linux/generic/backport-6.1/828-v6.4-0003-of-Rename-of_modalias_node.patch
+++ b/target/linux/generic/backport-6.1/828-v6.4-0003-of-Rename-of_modalias_node.patch
@@ -161,7 +161,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                goto err_out;
 --- a/include/linux/of.h
 +++ b/include/linux/of.h
-@@ -362,7 +362,8 @@ extern int of_n_addr_cells(struct device
+@@ -364,7 +364,8 @@ extern int of_n_addr_cells(struct device
  extern int of_n_size_cells(struct device_node *np);
  extern const struct of_device_id *of_match_node(
        const struct of_device_id *matches, const struct device_node *node);
diff --git a/target/linux/generic/backport-6.1/828-v6.4-0004-of-Move-of_modalias-to-module.c.patch b/target/linux/generic/backport-6.1/828-v6.4-0004-of-Move-of_modalias-to-module.c.patch
index 39a84161a27c752324b9b5976f224cd17807232f..16baed118750e7e89fd1d4932338e02883a80421 100644 (file)
--- a/target/linux/generic/backport-6.1/828-v6.4-0004-of-Move-of_modalias-to-module.c.patch
+++ b/target/linux/generic/backport-6.1/828-v6.4-0004-of-Move-of_modalias-to-module.c.patch
@@ -135,7 +135,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +}
 --- a/include/linux/of.h
 +++ b/include/linux/of.h
-@@ -374,6 +374,9 @@ extern int of_parse_phandle_with_args_ma
+@@ -376,6 +376,9 @@ extern int of_parse_phandle_with_args_ma
  extern int of_count_phandle_with_args(const struct device_node *np,
        const char *list_name, const char *cells_name);
  
@@ -145,7 +145,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  /* phandle iterator functions */
  extern int of_phandle_iterator_init(struct of_phandle_iterator *it,
                                    const struct device_node *np,
-@@ -731,6 +734,12 @@ static inline int of_count_phandle_with_
+@@ -733,6 +736,12 @@ static inline int of_count_phandle_with_
        return -ENOSYS;
  }
  
diff --git a/target/linux/generic/backport-6.1/828-v6.4-0005-of-Move-the-request-module-helper-logic-to-module.c.patch b/target/linux/generic/backport-6.1/828-v6.4-0005-of-Move-the-request-module-helper-logic-to-module.c.patch
index 046c1df5615f6277557892109090bd1d5fbe3935..67dcea0d19d0fc36ade9bcd04a41e848d5c76a71 100644 (file)
--- a/target/linux/generic/backport-6.1/828-v6.4-0005-of-Move-the-request-module-helper-logic-to-module.c.patch
+++ b/target/linux/generic/backport-6.1/828-v6.4-0005-of-Move-the-request-module-helper-logic-to-module.c.patch
@@ -109,7 +109,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +EXPORT_SYMBOL_GPL(of_request_module);
 --- a/include/linux/of.h
 +++ b/include/linux/of.h
-@@ -376,6 +376,7 @@ extern int of_count_phandle_with_args(co
+@@ -378,6 +378,7 @@ extern int of_count_phandle_with_args(co
  
  /* module functions */
  extern ssize_t of_modalias(const struct device_node *np, char *str, ssize_t len);
@@ -117,7 +117,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
  /* phandle iterator functions */
  extern int of_phandle_iterator_init(struct of_phandle_iterator *it,
-@@ -739,6 +740,11 @@ static inline ssize_t of_modalias(const
+@@ -741,6 +742,11 @@ static inline ssize_t of_modalias(const
  {
        return -ENODEV;
  }
diff --git a/target/linux/generic/backport-6.1/894-v6.8-net-ethtool-implement-ethtool_puts.patch b/target/linux/generic/backport-6.1/894-v6.8-net-ethtool-implement-ethtool_puts.patch
index 5094a6d7747a789e37a87f7e6298845d9133e12e..379a4fc7c074ae46b2f8e2cc18d15575f0a9ed41 100644 (file)
--- a/target/linux/generic/backport-6.1/894-v6.8-net-ethtool-implement-ethtool_puts.patch
+++ b/target/linux/generic/backport-6.1/894-v6.8-net-ethtool-implement-ethtool_puts.patch
@@ -123,7 +123,7 @@ Signed-off-by: Justin Stitt <justinstitt@google.com>
  #endif /* _LINUX_ETHTOOL_H */
 --- a/net/ethtool/ioctl.c
 +++ b/net/ethtool/ioctl.c
-@@ -1974,6 +1974,13 @@ __printf(2, 3) void ethtool_sprintf(u8 *
+@@ -1977,6 +1977,13 @@ __printf(2, 3) void ethtool_sprintf(u8 *
  }
  EXPORT_SYMBOL(ethtool_sprintf);
  
diff --git a/target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch
index d010231e49ee288883ef96a58964217c195f6c86..6e318a6e9a9da00fdfbea8c4c37e3a4e22701a1b 100644 (file)
--- a/target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch
+++ b/target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch
@@ -43,7 +43,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
  
  #define QUECTEL_VENDOR_ID                     0x2c7c
  /* These Quectel products use Quectel's vendor ID */
-@@ -1156,6 +1161,11 @@ static const struct usb_device_id option
+@@ -1158,6 +1163,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) },
@@ -55,7 +55,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),
-@@ -1197,6 +1207,11 @@ static const struct usb_device_id option
+@@ -1199,6 +1209,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.1/834-ledtrig-libata.patch b/target/linux/generic/pending-6.1/834-ledtrig-libata.patch
index 39960bc09004437f0eb721d60e4c97f9576912b4..7ca586c67636d3b14ef686d4ed94a6a558b41ed3 100644 (file)
--- a/target/linux/generic/pending-6.1/834-ledtrig-libata.patch
+++ b/target/linux/generic/pending-6.1/834-ledtrig-libata.patch
@@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        ata_sff_port_init(ap);
  
        return ap;
-@@ -5473,6 +5492,12 @@ static void ata_host_release(struct kref
+@@ -5476,6 +5495,12 @@ static void ata_host_release(struct kref
  
                kfree(ap->pmp_link);
                kfree(ap->slave_link);
@@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
                kfree(ap);
                host->ports[i] = NULL;
        }
-@@ -5875,7 +5900,23 @@ int ata_host_register(struct ata_host *h
+@@ -5878,7 +5903,23 @@ int ata_host_register(struct ata_host *h
                host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
                host->ports[i]->local_port_no = i + 1;
        }
Staging tree of David Bauer