aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-12-11 13:31:35 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-12-13 13:29:03 +0100
commit6f74e269c86c7aaec44edb5de0e122bebf54c71f (patch)
treec0097891ad238e9099f4db92c7251ee24ace7967 /target/linux/generic
parentb2f243394e424ac1d4924bc9a399281b9795af16 (diff)
downloadupstream-6f74e269c86c7aaec44edb5de0e122bebf54c71f.tar.gz
upstream-6f74e269c86c7aaec44edb5de0e122bebf54c71f.tar.bz2
upstream-6f74e269c86c7aaec44edb5de0e122bebf54c71f.zip
kernel: bump 4.14 to 4.14.87
Refreshed all patches. Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/hack-4.14/207-disable-modorder.patch4
-rw-r--r--target/linux/generic/hack-4.14/902-debloat_proc.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/hack-4.14/207-disable-modorder.patch b/target/linux/generic/hack-4.14/207-disable-modorder.patch
index fe6d5212f2..0619dcaa7b 100644
--- a/target/linux/generic/hack-4.14/207-disable-modorder.patch
+++ b/target/linux/generic/hack-4.14/207-disable-modorder.patch
@@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/Makefile
+++ b/Makefile
-@@ -1234,7 +1234,6 @@ all: modules
+@@ -1237,7 +1237,6 @@ all: modules
PHONY += modules
modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
@@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
@$(kecho) ' Building modules, stage 2.';
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
-@@ -1263,7 +1262,6 @@ _modinst_:
+@@ -1266,7 +1265,6 @@ _modinst_:
rm -f $(MODLIB)/build ; \
ln -s $(CURDIR) $(MODLIB)/build ; \
fi
diff --git a/target/linux/generic/hack-4.14/902-debloat_proc.patch b/target/linux/generic/hack-4.14/902-debloat_proc.patch
index 4e700ca0b7..cae6d66e7d 100644
--- a/target/linux/generic/hack-4.14/902-debloat_proc.patch
+++ b/target/linux/generic/hack-4.14/902-debloat_proc.patch
@@ -243,7 +243,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
-@@ -1951,10 +1951,12 @@ void __init init_mm_internals(void)
+@@ -1955,10 +1955,12 @@ void __init init_mm_internals(void)
start_shepherd_timer();
#endif
#ifdef CONFIG_PROC_FS