domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: bump 6.1 to 6.1.35

Browse Source 
All patches automatically rebased.

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

Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
John Audia
2023-06-21 11:19:45 -04:00
committed by Hauke Mehrtens
parent 1f5fce27c1
commit e0fb38f4ee
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-6.1
View File

@@ -1,2 +1,2 @@
LINUX_VERSION-6.1 = .34
LINUX_KERNEL_HASH-6.1.34 = b26f7cbcbf8031efc49f11f236f372fc34a4fd5fc6ad3151b893d1aa038ed603
LINUX_VERSION-6.1 = .35
LINUX_KERNEL_HASH-6.1.35 = be368143bc5d0dc73dd3e8c6191630c1620520379baf6f47c16116b2c0bc26ac

6
target/linux/bcm27xx/patches-6.1/950-0084-cgroup-Disable-cgroup-memory-by-default.patch
View 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);

4
target/linux/bcm27xx/patches-6.1/950-0238-zswap-Defer-zswap-initialisation.patch
View 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;

4
target/linux/bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch
View 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

2
target/linux/bmips/patches-6.1/600-mips-bmips-add-pci-support.patch
View 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

2
target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch
View 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) },

4
target/linux/generic/pending-6.1/300-mips_expose_boot_raw.patch
View 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