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/generic/patches-4.1/902-debloat_proc.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/generic/patches-4.1/902-debloat_proc.patch') diff --git a/target/linux/generic/patches-4.1/902-debloat_proc.patch b/target/linux/generic/patches-4.1/902-debloat_proc.patch index fef538254c..bf85100283 100644 --- a/target/linux/generic/patches-4.1/902-debloat_proc.patch +++ b/target/linux/generic/patches-4.1/902-debloat_proc.patch @@ -184,7 +184,7 @@ --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c -@@ -2630,10 +2630,12 @@ static const struct file_operations fib_ +@@ -2626,10 +2626,12 @@ static const struct file_operations fib_ int __net_init fib_proc_init(struct net *net) { @@ -199,7 +199,7 @@ &fib_triestat_fops)) goto out2; -@@ -2643,17 +2645,21 @@ int __net_init fib_proc_init(struct net +@@ -2639,17 +2641,21 @@ int __net_init fib_proc_init(struct net return 0; out3: -- cgit v1.2.3