diff options
author | Etienne Haarsma <bladeoner112@gmail.com> | 2018-05-05 18:50:42 +0200 |
---|---|---|
committer | John Crispin <john@phrozen.org> | 2018-05-07 07:58:33 +0200 |
commit | e8b1af45f8b2883e76f5d491c2fda2fca20c5634 (patch) | |
tree | d681b02c5305d30e79f0af0f986e6407e9d39c69 /target/linux/ramips | |
parent | 999bb66b20b03c753801ecebf1ec2a03c6a63c96 (diff) | |
download | upstream-e8b1af45f8b2883e76f5d491c2fda2fca20c5634.tar.gz upstream-e8b1af45f8b2883e76f5d491c2fda2fca20c5634.tar.bz2 upstream-e8b1af45f8b2883e76f5d491c2fda2fca20c5634.zip |
kernel: bump kernel 4.4 to 4.4.131 for 17.01
* Refreshed patches
Compile-tested: ar71xx
Run-tested: ar71xx
Signed-off-by: Etienne Haarsma <bladeoner112@gmail.com>
Diffstat (limited to 'target/linux/ramips')
-rw-r--r-- | target/linux/ramips/patches-4.4/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch | 4 | ||||
-rw-r--r-- | target/linux/ramips/patches-4.4/0037-mtd-cfi-cmdset-0002-force-word-write.patch | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/ramips/patches-4.4/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch b/target/linux/ramips/patches-4.4/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch index b6189fe096..1bcad6d2bd 100644 --- a/target/linux/ramips/patches-4.4/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch +++ b/target/linux/ramips/patches-4.4/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch @@ -9,7 +9,7 @@ Subject: [PATCH 36/53] mtd: fix cfi cmdset 0002 erase status check --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -2291,7 +2291,7 @@ static int __xipram do_erase_chip(struct +@@ -2293,7 +2293,7 @@ static int __xipram do_erase_chip(struct chip->erase_suspended = 0; } @@ -18,7 +18,7 @@ Subject: [PATCH 36/53] mtd: fix cfi cmdset 0002 erase status check break; if (time_after(jiffies, timeo)) { -@@ -2380,7 +2380,7 @@ static int __xipram do_erase_oneblock(st +@@ -2383,7 +2383,7 @@ static int __xipram do_erase_oneblock(st chip->erase_suspended = 0; } diff --git a/target/linux/ramips/patches-4.4/0037-mtd-cfi-cmdset-0002-force-word-write.patch b/target/linux/ramips/patches-4.4/0037-mtd-cfi-cmdset-0002-force-word-write.patch index 8f274bca15..f6b05a56e7 100644 --- a/target/linux/ramips/patches-4.4/0037-mtd-cfi-cmdset-0002-force-word-write.patch +++ b/target/linux/ramips/patches-4.4/0037-mtd-cfi-cmdset-0002-force-word-write.patch @@ -44,7 +44,7 @@ Subject: [PATCH 37/53] mtd: cfi cmdset 0002 force word write /* Atmel chips don't use the same PRI format as AMD chips */ static void fixup_convert_atmel_pri(struct mtd_info *mtd) -@@ -1789,6 +1793,7 @@ static int cfi_amdstd_write_words(struct +@@ -1790,6 +1794,7 @@ static int cfi_amdstd_write_words(struct /* * FIXME: interleaved mode not tested, and probably not supported! */ @@ -52,7 +52,7 @@ Subject: [PATCH 37/53] mtd: cfi cmdset 0002 force word write static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, unsigned long adr, const u_char *buf, int len) -@@ -1917,7 +1922,6 @@ static int __xipram do_write_buffer(stru +@@ -1918,7 +1923,6 @@ static int __xipram do_write_buffer(stru return ret; } @@ -60,7 +60,7 @@ Subject: [PATCH 37/53] mtd: cfi cmdset 0002 force word write static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf) { -@@ -1992,6 +1996,7 @@ static int cfi_amdstd_write_buffers(stru +@@ -1993,6 +1997,7 @@ static int cfi_amdstd_write_buffers(stru return 0; } |