aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
diff options
context:
space:
mode:
authorZoltan HERPAI <wigyori@uid0.hu>2016-10-27 15:13:36 +0200
committerZoltan HERPAI <wigyori@uid0.hu>2016-10-27 15:13:36 +0200
commitf14d3f5d46d9ef534cd51360f066260fb434548f (patch)
tree81ec5060ed9ba99e9bd1eeb2556737cfe0015158 /target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
parentce116bc6f997d8d6e6b976cacce5d4c60d705fc6 (diff)
downloadmaster-187ad058-f14d3f5d46d9ef534cd51360f066260fb434548f.tar.gz
master-187ad058-f14d3f5d46d9ef534cd51360f066260fb434548f.tar.bz2
master-187ad058-f14d3f5d46d9ef534cd51360f066260fb434548f.zip
generic/3.18: bump kernel to 3.18.44
Patch 610- is updated as check_entry helper was killed in 3.18.37 Patch 666- is updated (thanks to Stijn Tintel) Fixes CVE-2016-5195 (dirtycow) Compile-tested on adm5120 and mcs814x Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
Diffstat (limited to 'target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch')
-rw-r--r--target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
index d7b20b81f5..bca3487d18 100644
--- a/target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
+++ b/target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
@@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
-@@ -1209,6 +1209,49 @@ static struct mtd_info * __init open_mtd
+@@ -1212,6 +1212,49 @@ static struct mtd_info * __init open_mtd
return mtd;
}
@@ -61,7 +61,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
static int __init ubi_init(void)
{
int err, i, k;
-@@ -1298,6 +1341,12 @@ static int __init ubi_init(void)
+@@ -1301,6 +1344,12 @@ static int __init ubi_init(void)
}
}