diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2018-02-18 01:43:25 +0100 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2018-02-18 02:59:57 +0100 |
| commit | f621b539512e5b6c83dd2de1bc2dba06e40cd7ea (patch) | |
| tree | 0031132613ec4876d3719afab772e3cb4caec4ab /target/linux/ramips | |
| parent | 1c308bbbf598e09e463f67686ff4b7dafcb98ae6 (diff) | |
| download | upstream-f621b539512e5b6c83dd2de1bc2dba06e40cd7ea.tar.gz upstream-f621b539512e5b6c83dd2de1bc2dba06e40cd7ea.tar.bz2 upstream-f621b539512e5b6c83dd2de1bc2dba06e40cd7ea.zip | |
kernel: bump 4.9 to 4.9.82
Refresh patches.
Remove upstreamed patches:
- ar7/002-MIPS-AR7-ensure-the-port-type-s-FCR-value-is-used.patch
- backport/040-crypto-fix-typo-in-KPP-dependency-of-CRYPTO_ECDH.patch
Remove layerscape/819-Revert-dmaengine-dmatest-move-callback-wait-queue-to.patch,
it is superseded by upstream commit 297c7cc4b5651b174a62925b6c961085f04979fd.
Remove pending/650-pppoe_header_pad.patch, it is superseded by
upstream commit 1bd21b158e07e0b8c5a2ce832305a0ebfe42c480.
Update patches that no longer apply:
- ar71xx/004-register_gpio_driver_earlier.patch
- hack/204-module_strip.patch
- pending/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
Fixes CVE-2017-8824.
Compile-tested: ar71xx.
Runtime-tested: ar71xx.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/ramips')
| -rw-r--r-- | target/linux/ramips/patches-4.9/0040-nand-hack.patch | 4 | ||||
| -rw-r--r-- | target/linux/ramips/patches-4.9/0901-spansion_nand_id_fix.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ramips/patches-4.9/0040-nand-hack.patch b/target/linux/ramips/patches-4.9/0040-nand-hack.patch index e0bd5f6026..5bc00b16b5 100644 --- a/target/linux/ramips/patches-4.9/0040-nand-hack.patch +++ b/target/linux/ramips/patches-4.9/0040-nand-hack.patch @@ -18,7 +18,7 @@ if (ret < 0) { if (use_bufpoi) /* Invalidate page cache */ -@@ -3206,8 +3210,11 @@ int nand_erase_nand(struct mtd_info *mtd +@@ -3209,8 +3213,11 @@ int nand_erase_nand(struct mtd_info *mtd (page + pages_per_block)) chip->pagebuf = -1; @@ -31,7 +31,7 @@ /* * See if operation failed and additional status checks are * available -@@ -4401,6 +4408,7 @@ int nand_scan_ident(struct mtd_info *mtd +@@ -4404,6 +4411,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 */ diff --git a/target/linux/ramips/patches-4.9/0901-spansion_nand_id_fix.patch b/target/linux/ramips/patches-4.9/0901-spansion_nand_id_fix.patch index daaa0aca65..fa5b1274ef 100644 --- a/target/linux/ramips/patches-4.9/0901-spansion_nand_id_fix.patch +++ b/target/linux/ramips/patches-4.9/0901-spansion_nand_id_fix.patch @@ -13,7 +13,7 @@ Signed-off-by: Nikolay Martynov <mar.kolya@gmail.com> --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c -@@ -3853,6 +3853,7 @@ static void nand_decode_ext_id(struct mt +@@ -3856,6 +3856,7 @@ static void nand_decode_ext_id(struct mt /* * Field definitions are in the following datasheets: * Old style (4,5 byte ID): Samsung K9GAG08U0M (p.32) @@ -21,7 +21,7 @@ Signed-off-by: Nikolay Martynov <mar.kolya@gmail.com> * New Samsung (6 byte ID): Samsung K9GAG08U0F (p.44) * Hynix MLC (6 byte ID): Hynix H27UBG8T2B (p.22) * -@@ -3950,6 +3951,19 @@ static void nand_decode_ext_id(struct mt +@@ -3953,6 +3954,19 @@ static void nand_decode_ext_id(struct mt *busw = (extid & 0x01) ? NAND_BUSWIDTH_16 : 0; /* |