From 0cd478518fd2333cb6a33e134b4e15eb4efd5eb3 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 4 Oct 2015 11:34:39 +0000 Subject: 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 [update from 4.1.9 to 4.1.10] Signed-off-by: Hauke Mehrtens SVN-Revision: 47104 --- target/linux/oxnas/patches-4.1/300-introduce-oxnas-platform.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/oxnas/patches-4.1/300-introduce-oxnas-platform.patch') diff --git a/target/linux/oxnas/patches-4.1/300-introduce-oxnas-platform.patch b/target/linux/oxnas/patches-4.1/300-introduce-oxnas-platform.patch index d96633db71..3130a021e8 100644 --- a/target/linux/oxnas/patches-4.1/300-introduce-oxnas-platform.patch +++ b/target/linux/oxnas/patches-4.1/300-introduce-oxnas-platform.patch @@ -1,6 +1,6 @@ --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -599,6 +599,18 @@ config ARCH_LPC32XX +@@ -600,6 +600,18 @@ config ARCH_LPC32XX help Support for the NXP LPC32XX family of processors @@ -19,7 +19,7 @@ config ARCH_PXA bool "PXA2xx/PXA3xx-based" depends on MMU -@@ -897,6 +909,8 @@ source "arch/arm/mach-omap2/Kconfig" +@@ -898,6 +910,8 @@ source "arch/arm/mach-omap2/Kconfig" source "arch/arm/mach-orion5x/Kconfig" -- cgit v1.2.3