diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2022-04-06 22:51:50 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-04-07 20:46:57 +0200 |
| commit | 3826e214652b48e8ae92308a1a92b9e70cacfc49 (patch) | |
| tree | e244ef11812d390bbf3c8673c99cc809c326a853 | |
| parent | 087795323576ab8f4478f5aa3568adaec717d26f (diff) | |
| download | upstream-3826e214652b48e8ae92308a1a92b9e70cacfc49.tar.gz upstream-3826e214652b48e8ae92308a1a92b9e70cacfc49.tar.bz2 upstream-3826e214652b48e8ae92308a1a92b9e70cacfc49.zip | |
kernel: bump 5.10 to 5.10.109
Patches automatically rebased.
Compile-tested: lantiq/xrx200
Run-tested: lantiq/xrx200
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
3 files changed, 9 insertions, 9 deletions
diff --git a/include/kernel-5.10 b/include/kernel-5.10 index 954c35edac..c5eee97a30 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.10 = .108 -LINUX_KERNEL_HASH-5.10.108 = bf6cc2d6e0918b8f34d1cde2fa39a6ad69c45025425048be1a1dac4a5b3641d8 +LINUX_VERSION-5.10 = .109 +LINUX_KERNEL_HASH-5.10.109 = 18fb22ecb249669ea775474aee614dcb0697cab299068074fd9f0bafa32113dc diff --git a/target/linux/bcm27xx/patches-5.10/950-0517-staging-fbtft-Add-minipitft13-variant.patch b/target/linux/bcm27xx/patches-5.10/950-0517-staging-fbtft-Add-minipitft13-variant.patch index 26419b40c7..9842e92a7f 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0517-staging-fbtft-Add-minipitft13-variant.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0517-staging-fbtft-Add-minipitft13-variant.patch @@ -29,7 +29,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> /** * init_display() - initialize the display controller * -@@ -145,6 +151,22 @@ static int init_display(struct fbtft_par +@@ -147,6 +153,22 @@ static int init_display(struct fbtft_par return 0; } @@ -52,7 +52,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> /** * set_var() - apply LCD properties like rotation and BGR mode * -@@ -155,20 +177,32 @@ static int init_display(struct fbtft_par +@@ -157,20 +179,32 @@ static int init_display(struct fbtft_par static int set_var(struct fbtft_par *par) { u8 madctl_par = 0; @@ -85,7 +85,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> break; default: return -EINVAL; -@@ -265,7 +299,16 @@ static struct fbtft_display display = { +@@ -267,7 +301,16 @@ static struct fbtft_display display = { }, }; diff --git a/target/linux/bcm27xx/patches-5.10/950-0639-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/bcm27xx/patches-5.10/950-0639-cgroup-Disable-cgroup-memory-by-default.patch index 2fa648a233..315d79ddf4 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0639-cgroup-Disable-cgroup-memory-by-default.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0639-cgroup-Disable-cgroup-memory-by-default.patch @@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c -@@ -5695,6 +5695,9 @@ int __init cgroup_init_early(void) +@@ -5720,6 +5720,9 @@ int __init cgroup_init_early(void) return 0; } @@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> /** * cgroup_init - cgroup initialization * -@@ -5733,6 +5736,12 @@ int __init cgroup_init(void) +@@ -5758,6 +5761,12 @@ int __init cgroup_init(void) mutex_unlock(&cgroup_mutex); @@ -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 = -@@ -6270,6 +6279,10 @@ static int __init cgroup_disable(char *s +@@ -6296,6 +6305,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); -@@ -6279,6 +6292,31 @@ static int __init cgroup_disable(char *s +@@ -6305,6 +6318,31 @@ static int __init cgroup_disable(char *s } __setup("cgroup_disable=", cgroup_disable); |