aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-4.14/207-disable-modorder.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-07-04 00:54:41 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2020-07-04 21:12:42 +0200
commitce958dd88a7e74cd7aa7c345c97c79556bc2d926 (patch)
tree2a92f6397265cca8137812de80713ea1171287a6 /target/linux/generic/hack-4.14/207-disable-modorder.patch
parent78b632134f1597e4cc6498a7bb913c4f9b036caf (diff)
downloadupstream-ce958dd88a7e74cd7aa7c345c97c79556bc2d926.tar.gz
upstream-ce958dd88a7e74cd7aa7c345c97c79556bc2d926.tar.bz2
upstream-ce958dd88a7e74cd7aa7c345c97c79556bc2d926.zip
kernel: Update kernel 4.14 to version 4.14.187
Fixes: - CVE-2020-10757 The "mtd: rawnand: Pass a nand_chip object to nand_release()" commit was backported which needed some adaptations to other code. Build tested: ramips Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/hack-4.14/207-disable-modorder.patch')
-rw-r--r--target/linux/generic/hack-4.14/207-disable-modorder.patch4
1 files changed, 2 insertions, 2 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 35834291cc..0cfb4d33ec 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
-@@ -1252,7 +1252,6 @@ all: modules
+@@ -1260,7 +1260,6 @@ endif
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
-@@ -1281,7 +1280,6 @@ _modinst_:
+@@ -1289,7 +1288,6 @@ _modinst_:
rm -f $(MODLIB)/build ; \
ln -s $(CURDIR) $(MODLIB)/build ; \
fi