[openwrt/openwrt] kernel: bump 6.1 to 6.1.35

LEDE Commits lede-commits at lists.infradead.org
Fri Jun 23 14:07:45 PDT 2023 

hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/e0fb38f4eeed6cd56d4b5178aeb91442b4fe92a5

commit e0fb38f4eeed6cd56d4b5178aeb91442b4fe92a5
Author: John Audia <therealgraysky at proton.me>
AuthorDate: Wed Jun 21 11:19:45 2023 -0400

    kernel: bump 6.1 to 6.1.35
    
    All patches automatically rebased.
    
    Build system: x86_64
    Build-tested: bcm2711/RPi4B
    Run-tested: bcm2711/RPi4B
    
    Signed-off-by: John Audia <therealgraysky at proton.me>
---
 include/kernel-6.1                                                  | 4 ++--
 .../950-0084-cgroup-Disable-cgroup-memory-by-default.patch          | 6 +++---
 .../patches-6.1/950-0238-zswap-Defer-zswap-initialisation.patch     | 4 ++--
 .../bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch    | 4 ++--
 target/linux/bmips/patches-6.1/600-mips-bmips-add-pci-support.patch | 2 +-
 .../linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch | 2 +-
 target/linux/generic/pending-6.1/300-mips_expose_boot_raw.patch     | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/kernel-6.1 b/include/kernel-6.1
index 96a1eadb2a..bc84e23dad 100644
--- a/include/kernel-6.1
+++ b/include/kernel-6.1
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .34
-LINUX_KERNEL_HASH-6.1.34 = b26f7cbcbf8031efc49f11f236f372fc34a4fd5fc6ad3151b893d1aa038ed603
\ No newline at end of file
+LINUX_VERSION-6.1 = .35
+LINUX_KERNEL_HASH-6.1.35 = be368143bc5d0dc73dd3e8c6191630c1620520379baf6f47c16116b2c0bc26ac
\ No newline at end of file
diff --git a/target/linux/bcm27xx/patches-6.1/950-0084-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/bcm27xx/patches-6.1/950-0084-cgroup-Disable-cgroup-memory-by-default.patch
index 77419cbc4b..d437cccb3c 100644
--- a/target/linux/bcm27xx/patches-6.1/950-0084-cgroup-Disable-cgroup-memory-by-default.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0084-cgroup-Disable-cgroup-memory-by-default.patch
@@ -29,7 +29,7 @@ Signed-off-by: Phil Elwell <phil at raspberrypi.org>
   *
 @@ -6079,6 +6082,12 @@ int __init cgroup_init(void)
  
- 	mutex_unlock(&cgroup_mutex);
+ 	cgroup_unlock();
  
 +	/*
 +	 * Apply an implicit disable, knowing that an explicit enable will
@@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <phil at raspberrypi.org>
  	for_each_subsys(ss, ssid) {
  		if (ss->early_init) {
  			struct cgroup_subsys_state *css =
-@@ -6717,6 +6726,10 @@ static int __init cgroup_disable(char *s
+@@ -6716,6 +6725,10 @@ static int __init cgroup_disable(char *s
  			    strcmp(token, ss->legacy_name))
  				continue;
  
@@ -51,7 +51,7 @@ Signed-off-by: Phil Elwell <phil at raspberrypi.org>
  			static_branch_disable(cgroup_subsys_enabled_key[i]);
  			pr_info("Disabling %s control group subsystem\n",
  				ss->name);
-@@ -6735,6 +6748,31 @@ static int __init cgroup_disable(char *s
+@@ -6734,6 +6747,31 @@ static int __init cgroup_disable(char *s
  }
  __setup("cgroup_disable=", cgroup_disable);
  
diff --git a/target/linux/bcm27xx/patches-6.1/950-0238-zswap-Defer-zswap-initialisation.patch b/target/linux/bcm27xx/patches-6.1/950-0238-zswap-Defer-zswap-initialisation.patch
index eccee8dd36..845b3466de 100644
--- a/target/linux/bcm27xx/patches-6.1/950-0238-zswap-Defer-zswap-initialisation.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0238-zswap-Defer-zswap-initialisation.patch
@@ -80,7 +80,7 @@ Signed-off-by: Phil Elwell <phil at raspberrypi.com>
  }
  
  /*********************************
-@@ -1489,7 +1505,6 @@ static int __init zswap_debugfs_init(voi
+@@ -1496,7 +1512,6 @@ static int __init zswap_debugfs_init(voi
  **********************************/
  static int __init init_zswap(void)
  {
@@ -88,7 +88,7 @@ Signed-off-by: Phil Elwell <phil at raspberrypi.com>
  	int ret;
  
  	zswap_init_started = true;
-@@ -1513,33 +1528,23 @@ static int __init init_zswap(void)
+@@ -1520,33 +1535,23 @@ static int __init init_zswap(void)
  	if (ret)
  		goto hp_fail;
  
diff --git a/target/linux/bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch b/target/linux/bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch
index e85056aee7..1c4a478148 100644
--- a/target/linux/bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch
+++ b/target/linux/bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch
@@ -13,7 +13,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -272,19 +272,13 @@ config BMIPS_GENERIC
+@@ -273,19 +273,13 @@ config BMIPS_GENERIC
  	select SYNC_R4K
  	select COMMON_CLK
  	select BCM6345_L1_IRQ
@@ -33,7 +33,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
  	select SWAP_IO_SPACE
  	select USB_EHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN
  	select USB_EHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
-@@ -294,6 +288,7 @@ config BMIPS_GENERIC
+@@ -295,6 +289,7 @@ config BMIPS_GENERIC
  	select HAVE_PCI
  	select PCI_DRIVERS_GENERIC
  	select FW_CFE
diff --git a/target/linux/bmips/patches-6.1/600-mips-bmips-add-pci-support.patch b/target/linux/bmips/patches-6.1/600-mips-bmips-add-pci-support.patch
index f28dda908d..66e8db4d01 100644
--- a/target/linux/bmips/patches-6.1/600-mips-bmips-add-pci-support.patch
+++ b/target/linux/bmips/patches-6.1/600-mips-bmips-add-pci-support.patch
@@ -14,7 +14,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -286,7 +286,6 @@ config BMIPS_GENERIC
+@@ -287,7 +287,6 @@ config BMIPS_GENERIC
  	select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
  	select HARDIRQS_SW_RESEND
  	select HAVE_PCI
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 23f8be5d26..7257f7010b 100644
--- 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
@@ -29,7 +29,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
  
  #define QUECTEL_VENDOR_ID			0x2c7c
  /* These Quectel products use Quectel's vendor ID */
-@@ -1169,6 +1171,11 @@ static const struct usb_device_id option
+@@ -1173,6 +1175,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/300-mips_expose_boot_raw.patch b/target/linux/generic/pending-6.1/300-mips_expose_boot_raw.patch
index a4413e919b..82576d644d 100644
--- a/target/linux/generic/pending-6.1/300-mips_expose_boot_raw.patch
+++ b/target/linux/generic/pending-6.1/300-mips_expose_boot_raw.patch
@@ -9,7 +9,7 @@ Acked-by: Rob Landley <rob at landley.net>
 ---
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1032,9 +1032,6 @@ config FW_ARC
+@@ -1033,9 +1033,6 @@ config FW_ARC
  config ARCH_MAY_HAVE_PC_FDC
  	bool
  
@@ -19,7 +19,7 @@ Acked-by: Rob Landley <rob at landley.net>
  config CEVT_BCM1480
  	bool
  
-@@ -3089,6 +3086,18 @@ choice
+@@ -3090,6 +3087,18 @@ choice
  		bool "Extend builtin kernel arguments with bootloader arguments"
  endchoice

More information about the lede-commits mailing list