kernel: backport upstream bridge multicast snooping fixes

[oweals/openwrt.git] / target / linux / generic / patches-3.10 / 902-debloat_proc.patch

diff --git a/target/linux/generic/patches-3.10/902-debloat_proc.patch b/target/linux/generic/patches-3.10/902-debloat_proc.patch
index dc2a923989fa1f268ec03945e138eae1c30533a7..6f551877da10215134ca5db364ef66a069ab5349 100644 (file)
--- a/target/linux/generic/patches-3.10/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.10/902-debloat_proc.patch
@@ -1,6 +1,6 @@
 --- a/fs/locks.c
 +++ b/fs/locks.c
-@@ -2267,6 +2267,8 @@ static const struct file_operations proc
+@@ -2266,6 +2266,8 @@ static const struct file_operations proc
  
  static int __init proc_locks_init(void)
  {
@@ -173,7 +173,7 @@
                goto err;
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -2839,6 +2839,8 @@ static __net_initdata struct pernet_oper
+@@ -2891,6 +2891,8 @@ static __net_initdata struct pernet_oper
  
  static int __init proto_init(void)
  {