diff for duplicates of <47B16AB7.1050100@bull.net>

diff --git a/a/1.txt b/N1/1.txt
index cff7b81..2999833 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2,7 +2,7 @@ Nadia Derbey wrote:
 > Andrew Morton wrote:
 > 
 >> On Mon, 11 Feb 2008 15:16:53 +0100
->> Nadia.Derbey-6ktuUTfB/bM@public.gmane.org wrote:
+>> Nadia.Derbey@bull.net wrote:
 >>
 >>
 >>> [PATCH 07/08]
diff --git a/a/2.hdr b/N1/2.hdr
index 4b86001..4f3eb1a 100644
--- a/a/2.hdr
+++ b/N1/2.hdr
@@ -1,4 +1,5 @@
-Content-Type: text/plain; charset="us-ascii"
-MIME-Version: 1.0
+Content-Type: text/x-patch;
+ name="ip_v4_v6_procfs.patch"
 Content-Transfer-Encoding: 7bit
-Content-Disposition: inline
+Content-Disposition: inline;
+ filename="ip_v4_v6_procfs.patch"
diff --git a/a/2.txt b/N1/2.txt
index 2235503..ba1d278 100644
--- a/a/2.txt
+++ b/N1/2.txt
@@ -1,4 +1,56 @@
-_______________________________________________
-Containers mailing list
-Containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
-https://lists.linux-foundation.org/mailman/listinfo/containers
+Fix header files to let IPV4 and IPV6 build if CONFIG_PROC_FS=n
+
+Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net>
+
+---
+ include/net/ip_fib.h |   13 ++++++++++++-
+ include/net/ipv6.h   |    6 +++---
+ 2 files changed, 15 insertions(+), 4 deletions(-)
+
+Index: linux-2.6.24-mm1/include/net/ip_fib.h
+===================================================================
+--- linux-2.6.24-mm1.orig/include/net/ip_fib.h	2008-02-12 11:03:40.000000000 +0100
++++ linux-2.6.24-mm1/include/net/ip_fib.h	2008-02-12 11:09:40.000000000 +0100
+@@ -266,6 +266,17 @@ static inline void fib_res_put(struct fi
+ #ifdef CONFIG_PROC_FS
+ extern int __net_init  fib_proc_init(struct net *net);
+ extern void __net_exit fib_proc_exit(struct net *net);
+-#endif
++#else /* CONFIG_PROC_FS */
++static inline int fib_proc_init(struct net *net)
++{
++	return 0;
++}
++
++static inline int fib_proc_exit(struct net *net)
++{
++	return 0;
++}
++
++#endif /* CONFIG_PROC_FS */
+ 
+ #endif  /* _NET_FIB_H */
+Index: linux-2.6.24-mm1/include/net/ipv6.h
+===================================================================
+--- linux-2.6.24-mm1.orig/include/net/ipv6.h	2008-02-07 13:40:38.000000000 +0100
++++ linux-2.6.24-mm1/include/net/ipv6.h	2008-02-12 11:16:27.000000000 +0100
+@@ -586,9 +586,6 @@ extern int ip6_mc_msfget(struct sock *sk
+ 			 int __user *optlen);
+ 
+ #ifdef CONFIG_PROC_FS
+-extern struct ctl_table *ipv6_icmp_sysctl_init(struct net *net);
+-extern struct ctl_table *ipv6_route_sysctl_init(struct net *net);
+-
+ extern int  ac6_proc_init(void);
+ extern void ac6_proc_exit(void);
+ extern int  raw6_proc_init(void);
+@@ -621,6 +618,9 @@ static inline int snmp6_unregister_dev(s
+ extern ctl_table ipv6_route_table_template[];
+ extern ctl_table ipv6_icmp_table_template[];
+ 
++extern struct ctl_table *ipv6_icmp_sysctl_init(struct net *net);
++extern struct ctl_table *ipv6_route_sysctl_init(struct net *net);
++
+ extern int ipv6_sysctl_register(void);
+ extern void ipv6_sysctl_unregister(void);
+ #endif
diff --git a/a/content_digest b/N1/content_digest
index 99d183e..ba61841 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,24 +2,23 @@
  "ref\020080211141816.094061000@bull.net\0"
  "ref\020080211122408.5008902f.akpm@linux-foundation.org\0"
  "ref\047B167AF.6010008@bull.net\0"
- "ref\047B167AF.6010008-6ktuUTfB/bM@public.gmane.org\0"
- "From\0Nadia Derbey <Nadia.Derbey-6ktuUTfB/bM@public.gmane.org>\0"
+ "From\0Nadia Derbey <Nadia.Derbey@bull.net>\0"
  "Subject\0Re: [PATCH 7/8] Do not recompute msgmni anymore if explicitely set by user\0"
  "Date\0Tue, 12 Feb 2008 10:45:27 +0100\0"
- "To\0Nadia Derbey <Nadia.Derbey-6ktuUTfB/bM@public.gmane.org>\0"
- "Cc\0containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org"
-  linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org
-  cmm-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org
-  matthltc-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org
- " Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>\0"
+ "To\0Nadia Derbey <Nadia.Derbey@bull.net>\0"
+ "Cc\0Andrew Morton <akpm@linux-foundation.org>"
+  containers@lists.linux-foundation.org
+  linux-kernel@vger.kernel.org
+  linux-mm@kvack.org
+  cmm@us.ibm.com
+ " matthltc@us.ibm.com\0"
  "\01:1\0"
  "b\0"
  "Nadia Derbey wrote:\n"
  "> Andrew Morton wrote:\n"
  "> \n"
  ">> On Mon, 11 Feb 2008 15:16:53 +0100\n"
- ">> Nadia.Derbey-6ktuUTfB/bM@public.gmane.org wrote:\n"
+ ">> Nadia.Derbey@bull.net wrote:\n"
  ">>\n"
  ">>\n"
  ">>> [PATCH 07/08]\n"
@@ -86,10 +85,63 @@
  "\n"
  Oops, forgot the patch. Thx Benjamin!
  "\01:2\0"
+ "fn\0ip_v4_v6_procfs.patch\0"
  "b\0"
- "_______________________________________________\n"
- "Containers mailing list\n"
- "Containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org\n"
- https://lists.linux-foundation.org/mailman/listinfo/containers
+ "Fix header files to let IPV4 and IPV6 build if CONFIG_PROC_FS=n\n"
+ "\n"
+ "Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net>\n"
+ "\n"
+ "---\n"
+ " include/net/ip_fib.h |   13 ++++++++++++-\n"
+ " include/net/ipv6.h   |    6 +++---\n"
+ " 2 files changed, 15 insertions(+), 4 deletions(-)\n"
+ "\n"
+ "Index: linux-2.6.24-mm1/include/net/ip_fib.h\n"
+ "===================================================================\n"
+ "--- linux-2.6.24-mm1.orig/include/net/ip_fib.h\t2008-02-12 11:03:40.000000000 +0100\n"
+ "+++ linux-2.6.24-mm1/include/net/ip_fib.h\t2008-02-12 11:09:40.000000000 +0100\n"
+ "@@ -266,6 +266,17 @@ static inline void fib_res_put(struct fi\n"
+ " #ifdef CONFIG_PROC_FS\n"
+ " extern int __net_init  fib_proc_init(struct net *net);\n"
+ " extern void __net_exit fib_proc_exit(struct net *net);\n"
+ "-#endif\n"
+ "+#else /* CONFIG_PROC_FS */\n"
+ "+static inline int fib_proc_init(struct net *net)\n"
+ "+{\n"
+ "+\treturn 0;\n"
+ "+}\n"
+ "+\n"
+ "+static inline int fib_proc_exit(struct net *net)\n"
+ "+{\n"
+ "+\treturn 0;\n"
+ "+}\n"
+ "+\n"
+ "+#endif /* CONFIG_PROC_FS */\n"
+ " \n"
+ " #endif  /* _NET_FIB_H */\n"
+ "Index: linux-2.6.24-mm1/include/net/ipv6.h\n"
+ "===================================================================\n"
+ "--- linux-2.6.24-mm1.orig/include/net/ipv6.h\t2008-02-07 13:40:38.000000000 +0100\n"
+ "+++ linux-2.6.24-mm1/include/net/ipv6.h\t2008-02-12 11:16:27.000000000 +0100\n"
+ "@@ -586,9 +586,6 @@ extern int ip6_mc_msfget(struct sock *sk\n"
+ " \t\t\t int __user *optlen);\n"
+ " \n"
+ " #ifdef CONFIG_PROC_FS\n"
+ "-extern struct ctl_table *ipv6_icmp_sysctl_init(struct net *net);\n"
+ "-extern struct ctl_table *ipv6_route_sysctl_init(struct net *net);\n"
+ "-\n"
+ " extern int  ac6_proc_init(void);\n"
+ " extern void ac6_proc_exit(void);\n"
+ " extern int  raw6_proc_init(void);\n"
+ "@@ -621,6 +618,9 @@ static inline int snmp6_unregister_dev(s\n"
+ " extern ctl_table ipv6_route_table_template[];\n"
+ " extern ctl_table ipv6_icmp_table_template[];\n"
+ " \n"
+ "+extern struct ctl_table *ipv6_icmp_sysctl_init(struct net *net);\n"
+ "+extern struct ctl_table *ipv6_route_sysctl_init(struct net *net);\n"
+ "+\n"
+ " extern int ipv6_sysctl_register(void);\n"
+ " extern void ipv6_sysctl_unregister(void);\n"
+  #endif
 
-e2e024f031eb4f41b6b90f40a6ecf609a0f0fd08a2379678ea9f3c2d8187e902
+e5e2917d585c9e692a59e18434cab4e0213dbab9e0d983f32f28c175022426a6
