aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-07-04 11:54:47 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-07-04 14:16:37 +0200
commitd0839e020d0a80b3529a6a8fbbd5d618dfecafa3 (patch)
tree46eb844b852f47ad4119b40ebc89d430b5f59582 /target/linux/generic
parent01ca20cdfd0616fe2b199bd6d97d986f2a554dbe (diff)
downloadupstream-d0839e020d0a80b3529a6a8fbbd5d618dfecafa3.tar.gz
upstream-d0839e020d0a80b3529a6a8fbbd5d618dfecafa3.tar.bz2
upstream-d0839e020d0a80b3529a6a8fbbd5d618dfecafa3.zip
kernel: bump 4.14 to 4.14.53
Refreshed all patches Compile-tested on: cns3xxx, imx6, x86_64 Runtime-tested on: cns3xxx, imx6, x86_64 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/pending-4.14/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.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
index 2a09caf442..63afabb1d9 100644
--- a/target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
+++ b/target/linux/generic/pending-4.14/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
-@@ -1168,6 +1168,49 @@ static struct mtd_info * __init open_mtd
+@@ -1171,6 +1171,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;
-@@ -1251,6 +1294,12 @@ static int __init ubi_init(void)
+@@ -1254,6 +1297,12 @@ static int __init ubi_init(void)
}
}