diff options
| author | John Audia <therealgraysky@proton.me> | 2023-06-21 11:19:45 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-06-23 23:07:17 +0200 |
| commit | e0fb38f4eeed6cd56d4b5178aeb91442b4fe92a5 (patch) | |
| tree | d5b915cebdca1b75f0416e6355c5307bf6be6f9d /target/linux/bcm27xx | |
| parent | 1f5fce27c195373fedcf233a48470de97752058f (diff) | |
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@proton.me>
Diffstat (limited to 'target/linux/bcm27xx')
| -rw-r--r-- | target/linux/bcm27xx/patches-6.1/950-0084-cgroup-Disable-cgroup-memory-by-default.patch | 6 | ||||
| -rw-r--r-- | target/linux/bcm27xx/patches-6.1/950-0238-zswap-Defer-zswap-initialisation.patch | 4 |
2 files changed, 5 insertions, 5 deletions
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@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); 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@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; |