aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2016-11-06 11:13:37 +0100
committerGitHub <noreply@github.com>2016-11-06 11:13:37 +0100
commit9ce27c83ad3fe2fa5e6ba707dc6bc1182a0f32ed (patch)
tree87316c92634bbaa73948928ce290205a5076fd32 /target/linux/generic/patches-3.18/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
parentcabb0c506526fe468e4aa985086e50c440192122 (diff)
parent7862d74a17bb5a4a6d6b0d60d8cf33650b75c92a (diff)
downloadmaster-187ad058-9ce27c83ad3fe2fa5e6ba707dc6bc1182a0f32ed.tar.gz
master-187ad058-9ce27c83ad3fe2fa5e6ba707dc6bc1182a0f32ed.tar.bz2
master-187ad058-9ce27c83ad3fe2fa5e6ba707dc6bc1182a0f32ed.zip
Merge pull request #156 from wigyori/dirtycow-fixes
CVE-2016-5195 (dirtycow) fixes for 3.18, 4.1, 4.4
Diffstat (limited to 'target/linux/generic/patches-3.18/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch')
-rw-r--r--target/linux/generic/patches-3.18/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.18/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/target/linux/generic/patches-3.18/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
index 3f2b439362..54a2f8259c 100644
--- a/target/linux/generic/patches-3.18/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
+++ b/target/linux/generic/patches-3.18/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
@@ -41,7 +41,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
#ifdef CONFIG_ROOT_NFS
#define NFSROOT_TIMEOUT_MIN 5
-@@ -527,6 +547,10 @@ void __init mount_root(void)
+@@ -527,6 +548,10 @@ void __init mount_root(void)
change_floppy("root floppy");
}
#endif