aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq40xx/patches-4.14
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-07-04 00:19:51 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2020-07-04 19:22:23 +0200
commitf4985a22ca1b46bbfa71dec4219b7fbeca2c0023 (patch)
tree964f8813945913a7eaba920bda6a40be30516364 /target/linux/ipq40xx/patches-4.14
parent73fecd36bfd2b9f92a2a20f38bdb73b4433dec3e (diff)
downloadupstream-f4985a22ca1b46bbfa71dec4219b7fbeca2c0023.tar.gz
upstream-f4985a22ca1b46bbfa71dec4219b7fbeca2c0023.tar.bz2
upstream-f4985a22ca1b46bbfa71dec4219b7fbeca2c0023.zip
kernel: Update kernel 4.14 to version 4.14.187
Fixes: - CVE-2020-10757 Run tested: ath79, ipq40xx Build tested: ath79, ipq40xx Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ipq40xx/patches-4.14')
-rw-r--r--target/linux/ipq40xx/patches-4.14/050-0004-mtd-nand-provide-several-helpers-to-do-common-NAND-o.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/ipq40xx/patches-4.14/050-0004-mtd-nand-provide-several-helpers-to-do-common-NAND-o.patch b/target/linux/ipq40xx/patches-4.14/050-0004-mtd-nand-provide-several-helpers-to-do-common-NAND-o.patch
index 03dcb07554..6b8a86ebe5 100644
--- a/target/linux/ipq40xx/patches-4.14/050-0004-mtd-nand-provide-several-helpers-to-do-common-NAND-o.patch
+++ b/target/linux/ipq40xx/patches-4.14/050-0004-mtd-nand-provide-several-helpers-to-do-common-NAND-o.patch
@@ -1548,7 +1548,7 @@ Date: Thu Nov 30 18:01:29 2017 +0100
/*
--- a/include/linux/mtd/rawnand.h
+++ b/include/linux/mtd/rawnand.h
-@@ -1313,6 +1313,35 @@ int nand_write_page_raw(struct mtd_info
+@@ -1311,6 +1311,35 @@ int nand_write_page_raw(struct mtd_info
/* Reset and initialize a NAND device */
int nand_reset(struct nand_chip *chip, int chipnr);