diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-10-04 11:34:39 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-10-04 11:34:39 +0000 |
commit | 0cd478518fd2333cb6a33e134b4e15eb4efd5eb3 (patch) | |
tree | d0a1a756d8b4469d550ffbd17f0c7dd8300ecb82 /target/linux/brcm2708/patches-4.1/0001-Main-bcm2708-bcm2709-linux-port.patch | |
parent | dea417017edc6717e2662ab97b0af3d0b724d360 (diff) | |
download | upstream-0cd478518fd2333cb6a33e134b4e15eb4efd5eb3.tar.gz upstream-0cd478518fd2333cb6a33e134b4e15eb4efd5eb3.tar.bz2 upstream-0cd478518fd2333cb6a33e134b4e15eb4efd5eb3.zip |
kernel: update 4.1 to 4.1.10
Fixes a regression on spi flash devices (upstream commit 1583eaece6fa).
Changelogs:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.7
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.8
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.9
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.10
096-ipv4-off-by-one-in-continuation-handling-in-proc-net.patch was applied
upstream and dropped.
Signed-off-by: Mathias Kresin <openwrt@kresin.me>
[update from 4.1.9 to 4.1.10]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 47104
Diffstat (limited to 'target/linux/brcm2708/patches-4.1/0001-Main-bcm2708-bcm2709-linux-port.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.1/0001-Main-bcm2708-bcm2709-linux-port.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm2708/patches-4.1/0001-Main-bcm2708-bcm2709-linux-port.patch b/target/linux/brcm2708/patches-4.1/0001-Main-bcm2708-bcm2709-linux-port.patch index 80ad8c3461..79891f8504 100644 --- a/target/linux/brcm2708/patches-4.1/0001-Main-bcm2708-bcm2709-linux-port.patch +++ b/target/linux/brcm2708/patches-4.1/0001-Main-bcm2708-bcm2709-linux-port.patch @@ -168,7 +168,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org> config ARCH_MULTIPLATFORM bool "Allow multiple platforms to be selected" depends on MMU -@@ -823,6 +859,9 @@ config ARCH_VIRT +@@ -824,6 +860,9 @@ config ARCH_VIRT # Kconfigs may be included either alphabetically (according to the # plat- suffix) or along side the corresponding mach-* source. # @@ -6745,7 +6745,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org> ENTRY(cpu_v6_dcache_clean_area) --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S -@@ -456,6 +456,7 @@ __v7_setup: +@@ -460,6 +460,7 @@ __v7_setup_cont: orr r0, r0, r6 @ set them THUMB( orr r0, r0, #1 << 30 ) @ Thumb exceptions ret lr @ return to head.S:__ret |