From 88ba41453dbc65e1d5d596073d66bdf2e59a43a1 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Sat, 17 Feb 2018 22:59:07 +0100 Subject: kernel: bump 4.14 to 4.14.20 Refresh patches. Remove upstreamed patches: - backport/080-v4.15-0001-arch-define-weak-abort.patch - backport/081-v4.15-0002-kernel-exit.c-export-abort-to-modules.patch Update patch that no longer applies: pending/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch Fixes CVE-2017-8824. Compile-tested: octeon, x86/64. Runtime-tested: octeon, x86/64. Signed-off-by: Stijn Tintel --- .../linux/ramips/patches-4.14/0040-nand-hack-restore-write_page.patch | 4 ++-- target/linux/ramips/patches-4.14/0040-nand-hack.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/ramips') diff --git a/target/linux/ramips/patches-4.14/0040-nand-hack-restore-write_page.patch b/target/linux/ramips/patches-4.14/0040-nand-hack-restore-write_page.patch index 80136b89a6..048e60441c 100644 --- a/target/linux/ramips/patches-4.14/0040-nand-hack-restore-write_page.patch +++ b/target/linux/ramips/patches-4.14/0040-nand-hack-restore-write_page.patch @@ -12,7 +12,7 @@ int (*onfi_get_features)(struct mtd_info *mtd, struct nand_chip *chip, --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c -@@ -2753,9 +2753,14 @@ static int nand_do_write_ops(struct mtd_ +@@ -2756,9 +2756,14 @@ static int nand_do_write_ops(struct mtd_ memset(chip->oob_poi, 0xff, mtd->oobsize); } @@ -30,7 +30,7 @@ if (ret) break; -@@ -4711,6 +4716,9 @@ int nand_scan_tail(struct mtd_info *mtd) +@@ -4714,6 +4719,9 @@ int nand_scan_tail(struct mtd_info *mtd) } } diff --git a/target/linux/ramips/patches-4.14/0040-nand-hack.patch b/target/linux/ramips/patches-4.14/0040-nand-hack.patch index a9d16840f0..7b616eca46 100644 --- a/target/linux/ramips/patches-4.14/0040-nand-hack.patch +++ b/target/linux/ramips/patches-4.14/0040-nand-hack.patch @@ -18,7 +18,7 @@ if (ret < 0) { if (use_bufpoi) /* Invalidate page cache */ -@@ -3076,8 +3080,11 @@ int nand_erase_nand(struct mtd_info *mtd +@@ -3079,8 +3083,11 @@ int nand_erase_nand(struct mtd_info *mtd (page + pages_per_block)) chip->pagebuf = -1; @@ -31,7 +31,7 @@ /* See if block erase succeeded */ if (status & NAND_STATUS_FAIL) { pr_debug("%s: failed erase, page 0x%08x\n", -@@ -4207,6 +4214,7 @@ int nand_scan_ident(struct mtd_info *mtd +@@ -4210,6 +4217,7 @@ int nand_scan_ident(struct mtd_info *mtd * cmdfunc() both expect cmd_ctrl() to be populated, * so we need to check that that's the case */ -- cgit v1.2.3