aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-07-04 11:54:18 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-07-04 14:16:37 +0200
commit01ca20cdfd0616fe2b199bd6d97d986f2a554dbe (patch)
treefe2b3fda08a5f4eff6a51c95cda37f91352efdce /target/linux/generic
parent8722c52b41d551e768b3cc46049afb6657099d59 (diff)
downloadupstream-01ca20cdfd0616fe2b199bd6d97d986f2a554dbe.tar.gz
upstream-01ca20cdfd0616fe2b199bd6d97d986f2a554dbe.tar.bz2
upstream-01ca20cdfd0616fe2b199bd6d97d986f2a554dbe.zip
kernel: bump 4.9 to 4.9.111
Refreshed all patches Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/pending-4.9/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/pending-4.9/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/pending-4.9/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
index 1d44cdb9f4..8b37dba034 100644
--- a/target/linux/generic/pending-4.9/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
+++ b/target/linux/generic/pending-4.9/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
@@ -8,7 +8,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
-@@ -1223,6 +1223,49 @@ static struct mtd_info * __init open_mtd
+@@ -1226,6 +1226,49 @@ static struct mtd_info * __init open_mtd
return mtd;
}
@@ -58,7 +58,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
static int __init ubi_init(void)
{
int err, i, k;
-@@ -1306,6 +1349,12 @@ static int __init ubi_init(void)
+@@ -1309,6 +1352,12 @@ static int __init ubi_init(void)
}
}