aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.4/208-disable-modorder.patch
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2018-01-07 14:12:52 +0000
committerStijn Tintel <stijn@linux-ipv6.be>2018-01-10 00:11:39 +0200
commitefb375b5795dd26fed078fff8463ae5b49a73551 (patch)
tree0aac089e40804674f475674256debf320fe50589 /target/linux/generic/pending-4.4/208-disable-modorder.patch
parent1d2590f83826bb9cdf658001761593519186ce0e (diff)
downloadupstream-efb375b5795dd26fed078fff8463ae5b49a73551.tar.gz
upstream-efb375b5795dd26fed078fff8463ae5b49a73551.tar.bz2
upstream-efb375b5795dd26fed078fff8463ae5b49a73551.zip
kernel: bump 4.4 to 4.4.110
Refresh patches Fixes: CVE-2017-5754 aka Meltdown Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> [fix typo in commit msg, conflict after 4.14 bump] Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/generic/pending-4.4/208-disable-modorder.patch')
-rw-r--r--target/linux/generic/pending-4.4/208-disable-modorder.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-4.4/208-disable-modorder.patch b/target/linux/generic/pending-4.4/208-disable-modorder.patch
index 7ea91f2951..00d6e41952 100644
--- a/target/linux/generic/pending-4.4/208-disable-modorder.patch
+++ b/target/linux/generic/pending-4.4/208-disable-modorder.patch
@@ -5,7 +5,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
--- a/Makefile
+++ b/Makefile
-@@ -1118,7 +1118,6 @@ all: modules
+@@ -1121,7 +1121,6 @@ all: modules
PHONY += modules
modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
@@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
@$(kecho) ' Building modules, stage 2.';
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild
-@@ -1148,7 +1147,6 @@ _modinst_:
+@@ -1151,7 +1150,6 @@ _modinst_:
rm -f $(MODLIB)/build ; \
ln -s $(CURDIR) $(MODLIB)/build ; \
fi