aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/902-debloat_proc.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-03-18 18:21:08 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-03-18 18:21:08 +0000
commit5d4be21553ddc62ac97b9698c656829d7e814ee1 (patch)
tree96d2c11b857e6ec2cd443a6bb5cc76239994c1f9 /target/linux/generic/patches-3.18/902-debloat_proc.patch
parent5abe49b74ed399880c9f16e0fac2e1a2b302f9d7 (diff)
downloadmaster-187ad058-5d4be21553ddc62ac97b9698c656829d7e814ee1.tar.gz
master-187ad058-5d4be21553ddc62ac97b9698c656829d7e814ee1.tar.bz2
master-187ad058-5d4be21553ddc62ac97b9698c656829d7e814ee1.zip
kernel: bump to 3.14.35, 3.18.9, 3.19.1 and 4.0-rc4
also refresh generic patches for 3.14, 3.18, 3.19 and 4.0 targets might need a minor refresh as well, however, it looks like everything still applies cleanly with occasional small offsets. Signed-off-by: Daniel Golle <daniel@makrotopia.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44876 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/902-debloat_proc.patch')
-rw-r--r--target/linux/generic/patches-3.18/902-debloat_proc.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.18/902-debloat_proc.patch b/target/linux/generic/patches-3.18/902-debloat_proc.patch
index 929d6e5ba9..8b3a5d43f0 100644
--- a/target/linux/generic/patches-3.18/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.18/902-debloat_proc.patch
@@ -184,7 +184,7 @@
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
-@@ -2581,10 +2581,12 @@ static const struct file_operations fib_
+@@ -2490,10 +2490,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;
-@@ -2594,17 +2596,21 @@ int __net_init fib_proc_init(struct net
+@@ -2503,17 +2505,21 @@ int __net_init fib_proc_init(struct net
return 0;
out3: