aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/pistachio
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2020-02-21 15:10:15 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-02-24 14:21:08 +0100
commitfafe99b62d9c6e5ec3233d221113972023773450 (patch)
treec14c0f580d2f2a290ca0029f9734370e65799411 /target/linux/pistachio
parentbfee12cec638eed9b2197e3a12570a678839a1eb (diff)
downloadupstream-fafe99b62d9c6e5ec3233d221113972023773450.tar.gz
upstream-fafe99b62d9c6e5ec3233d221113972023773450.tar.bz2
upstream-fafe99b62d9c6e5ec3233d221113972023773450.zip
kernel: bump 4.14 to 4.14.171
Refreshed all patches. Fixes: - CVE-2013-1798 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/pistachio')
-rw-r--r--target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch
index 59d9e74d45..ef4b43bb55 100644
--- a/target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch
+++ b/target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch
@@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -2661,6 +2661,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -2666,6 +2666,7 @@ int spi_nor_scan(struct spi_nor *nor, co
struct device *dev = nor->dev;
struct mtd_info *mtd = &nor->mtd;
struct device_node *np = spi_nor_get_flash_node(nor);
@@ -18,7 +18,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
int ret;
int i;
-@@ -2736,7 +2737,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -2741,7 +2742,12 @@ int spi_nor_scan(struct spi_nor *nor, co
spi_nor_wait_till_ready(nor);
}