diff options
| author | Stijn Segers <francesco.borromini@inventati.org> | 2017-05-24 22:39:28 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-05-24 22:47:01 +0200 |
| commit | 215c1d05b8bb7b99cc8c40a877f649c5b1c15198 (patch) | |
| tree | e44256447d81a6ca36a1c616689494b12a83bce4 /target/linux/oxnas | |
| parent | d1a0fc3ec8e5323e95bec8db581bc7758aed783f (diff) | |
| download | upstream-215c1d05b8bb7b99cc8c40a877f649c5b1c15198.tar.gz upstream-215c1d05b8bb7b99cc8c40a877f649c5b1c15198.tar.bz2 upstream-215c1d05b8bb7b99cc8c40a877f649c5b1c15198.zip | |
kernel: update kernel 4.4 to 4.4.69
Bump the 17.01 tree kernel to 4.4.69. Trunk 4.4 and 17.01 4.4 have diverged, talked this
through with jow, he was okay with a clean diff against 17.01 and not a backported trunk
patch.
The following patches were applied upstream:
* 062-[1-6]-MIPS-* series
* 042-0004-mtd-bcm47xxpart-fix-parsing-first-block
Reintroduced lantiq/patches-4.4/0050-MIPS-Lantiq-Fix-cascaded-IRQ-setup, as
it was incorrectly included upstream thus dropped from LEDE, but subsequently
reverted upstream. Thanks to Kevin Darbyshire-Bryant for pointing me to it.
Compile-tested on: ar71xx, ramips/mt7621, x86/64.
Run-tested on: ar71xx, ramips/mt7621, x86/64.
Signed-off-by: Stijn Segers <francesco.borromini@inventati.org>
Diffstat (limited to 'target/linux/oxnas')
| -rw-r--r-- | target/linux/oxnas/patches-4.4/0072-mtd-backport-v4.7-0day-patches-from-Boris.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/oxnas/patches-4.4/0072-mtd-backport-v4.7-0day-patches-from-Boris.patch b/target/linux/oxnas/patches-4.4/0072-mtd-backport-v4.7-0day-patches-from-Boris.patch index b45d3aa579..4b25d18f96 100644 --- a/target/linux/oxnas/patches-4.4/0072-mtd-backport-v4.7-0day-patches-from-Boris.patch +++ b/target/linux/oxnas/patches-4.4/0072-mtd-backport-v4.7-0day-patches-from-Boris.patch @@ -4672,7 +4672,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> int INFTL_mount(struct INFTLrecord *s); --- a/include/linux/mtd/map.h +++ b/include/linux/mtd/map.h -@@ -142,7 +142,9 @@ +@@ -137,7 +137,9 @@ #endif #ifndef map_bankwidth @@ -4682,7 +4682,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> static inline int map_bankwidth(void *map) { BUG(); -@@ -238,8 +240,11 @@ struct map_info { +@@ -233,8 +235,11 @@ struct map_info { If there is no cache to care about this can be set to NULL. */ void (*inval_cache)(struct map_info *, unsigned long, ssize_t); |