kernel: bump 6.1 to 6.1.35
authorJohn Audia <therealgraysky@proton.me>
Wed, 21 Jun 2023 15:19:45 +0000 (11:19 -0400)
committerHauke Mehrtens <hauke@hauke-m.de>
Fri, 23 Jun 2023 21:07:17 +0000 (23:07 +0200)
All patches automatically rebased.

Build system: x86_64
Build-tested: bcm2711/RPi4B
Run-tested: bcm2711/RPi4B

Signed-off-by: John Audia <therealgraysky@proton.me>
include/kernel-6.1
target/linux/bcm27xx/patches-6.1/950-0084-cgroup-Disable-cgroup-memory-by-default.patch
target/linux/bcm27xx/patches-6.1/950-0238-zswap-Defer-zswap-initialisation.patch
target/linux/bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch
target/linux/bmips/patches-6.1/600-mips-bmips-add-pci-support.patch
target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch
target/linux/generic/pending-6.1/300-mips_expose_boot_raw.patch

index 96a1eadb2a5ea6a6d6c25c6b44a5f058fde30566..bc84e23dad799cf72a505ac36aba947740f42eb2 100644 (file)
@@ -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
index 77419cbc4b5325a732412cfb81cfcf4d3daa8e69..d437cccb3c7ee1b2e99fb5d5c4f9b2c7ed4a1703 100644 (file)
@@ -29,7 +29,7 @@ Signed-off-by: Phil Elwell <phil@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@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@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);
  
index eccee8dd3607c588e54fdaa7a91bba6a0085cfc0..845b3466de666e8c3507f45430279bf34e67468c 100644 (file)
@@ -80,7 +80,7 @@ Signed-off-by: Phil Elwell <phil@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@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;
  
index e85056aee790093d8065295280d4e48c8b59661b..1c4a478148f3ca0c5b5ef68483b62eed73c86d98 100644 (file)
@@ -13,7 +13,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@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@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
index f28dda908d7013205c3207595de80d7c44347f42..66e8db4d01084d91585295fab521bd62966e4fea 100644 (file)
@@ -14,7 +14,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@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
index 23f8be5d264be3cedf95b94ac177f14c8897759e..7257f7010bb1248b06b5a86708178932de510039 100644 (file)
@@ -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) },
index a4413e919b4b74ecc79a19e37613a8f3d3e55856..82576d644d761499842a63c180330f5a8163faee 100644 (file)
@@ -9,7 +9,7 @@ Acked-by: Rob Landley <rob@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@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