From af79c3bccce6781c7045bd09d37585a96c0a6137 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Fri, 21 Feb 2020 15:05:48 +0100 Subject: kernel: bump 4.14 to 4.14.171 Refreshed all patches. Fixes: - CVE-2013-1798 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte --- .../patches-4.14/950-0094-OF-DT-Overlay-configfs-interface.patch | 4 ++-- .../950-0136-cgroup-Disable-cgroup-memory-by-default.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'target/linux/brcm2708') diff --git a/target/linux/brcm2708/patches-4.14/950-0094-OF-DT-Overlay-configfs-interface.patch b/target/linux/brcm2708/patches-4.14/950-0094-OF-DT-Overlay-configfs-interface.patch index 164b4565b9..ed414e5ede 100644 --- a/target/linux/brcm2708/patches-4.14/950-0094-OF-DT-Overlay-configfs-interface.patch +++ b/target/linux/brcm2708/patches-4.14/950-0094-OF-DT-Overlay-configfs-interface.patch @@ -88,8 +88,8 @@ Signed-off-by: Slawomir Stepien +make sense for developers (since it avoids problems with namespaces). --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig -@@ -112,4 +112,11 @@ config OF_OVERLAY - config OF_NUMA +@@ -116,4 +116,11 @@ config OF_DMA_DEFAULT_COHERENT + # arches should select this if DMA is coherent by default for OF devices bool +config OF_CONFIGFS diff --git a/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch index fa0ebffb27..6aefcb5052 100644 --- a/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch +++ b/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch @@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c -@@ -5206,6 +5206,8 @@ int __init cgroup_init_early(void) +@@ -5207,6 +5207,8 @@ int __init cgroup_init_early(void) } static u16 cgroup_disable_mask __initdata; @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell /** * cgroup_init - cgroup initialization -@@ -5244,6 +5246,12 @@ int __init cgroup_init(void) +@@ -5245,6 +5247,12 @@ int __init cgroup_init(void) mutex_unlock(&cgroup_mutex); @@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell for_each_subsys(ss, ssid) { if (ss->early_init) { struct cgroup_subsys_state *css = -@@ -5635,6 +5643,28 @@ static int __init cgroup_disable(char *s +@@ -5636,6 +5644,28 @@ static int __init cgroup_disable(char *s } __setup("cgroup_disable=", cgroup_disable); -- cgit v1.2.3