aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.1/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:47:09 +0200
committerZoltan HERPAI <wigyori@uid0.hu>2016-10-27 15:47:09 +0200
commit1cb9409df2c093aa6770afe57c88a288ea21c363 (patch)
treef84bbb81caf74124987b2149d04acbcc796c4ad9 /target/linux/generic/patches-4.1/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
parentf14d3f5d46d9ef534cd51360f066260fb434548f (diff)
downloadmaster-187ad058-1cb9409df2c093aa6770afe57c88a288ea21c363.tar.gz
master-187ad058-1cb9409df2c093aa6770afe57c88a288ea21c363.tar.bz2
master-187ad058-1cb9409df2c093aa6770afe57c88a288ea21c363.zip
generic/4.1: bump kernel to 4.1.35
Patch 610- is updated as check_entry helper was killed Patch 666- is updated (thanks to Stijn Tintel) Fixes CVE-2016-5195 (dirtycow) Compile-tested on brcm47xx and rb532 Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
Diffstat (limited to 'target/linux/generic/patches-4.1/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch')
-rw-r--r--target/linux/generic/patches-4.1/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-4.1/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/patches-4.1/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
index d2fb8022e4..7afc1386b1 100644
--- a/target/linux/generic/patches-4.1/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
+++ b/target/linux/generic/patches-4.1/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
-@@ -1218,6 +1218,49 @@ static struct mtd_info * __init open_mtd
+@@ -1221,6 +1221,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;
-@@ -1310,6 +1353,12 @@ static int __init ubi_init(void)
+@@ -1313,6 +1356,12 @@ static int __init ubi_init(void)
}
}