diff for duplicates of <1334267284-19166-4-git-send-email-wad@chromium.org>

diff --git a/a/1.txt b/N1/1.txt
index 2b5cc45..f29c2af 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -3,10 +3,10 @@ userspace will need to be able to also accept a compat_sock_fprog
 if the arch supports compat calls.  This change allows the existing
 compat_sock_fprog be shared.
 
-Signed-off-by: Will Drewry <wad@chromium.org>
-Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
-Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
-Acked-by: Eric Paris <eparis@redhat.com>
+Signed-off-by: Will Drewry <wad-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
+Acked-by: Serge Hallyn <serge.hallyn-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
+Acked-by: Eric Dumazet <eric.dumazet-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
+Acked-by: Eric Paris <eparis-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
 
 v18: tasered by the apostrophe police
 v14: rebase/nochanges
@@ -61,10 +61,4 @@ index e055708..242c828 100644
 -struct compat_sock_fprog {
 -	u16		len;
 -	compat_uptr_t	filter;		/* struct sock_filter * */
--};
--
- static int do_set_attach_filter(struct socket *sock, int level, int optname,
- 				char __user *optval, unsigned int optlen)
- {
--- 
-1.7.5.4
\ No newline at end of file
+-};
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 3bded90..db2e5ff 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,10 @@
   "ref\0001334267284-19166-1-git-send-email-wad\@chromium.org\0"
 ]
 [
-  "From\0Will Drewry <wad\@chromium.org>\0"
+  "ref\0001334267284-19166-1-git-send-email-wad-F7+t8E8rja9g9hUCZPvPmw\@public.gmane.org\0"
+]
+[
+  "From\0Will Drewry <wad-F7+t8E8rja9g9hUCZPvPmw\@public.gmane.org>\0"
 ]
 [
   "Subject\0[PATCH v18 04/15] net/compat.c,linux/filter.h: share compat_sock_fprog\0"
@@ -11,40 +14,40 @@
   "Date\0Thu, 12 Apr 2012 16:47:53 -0500\0"
 ]
 [
-  "To\0linux-kernel\@vger.kernel.org\0"
+  "To\0linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org\0"
 ]
 [
-  "Cc\0linux-man\@vger.kernel.org",
-  " linux-security-module\@vger.kernel.org",
-  " linux-arch\@vger.kernel.org",
-  " linux-doc\@vger.kernel.org",
-  " kernel-hardening\@lists.openwall.com",
-  " netdev\@vger.kernel.org",
-  " x86\@kernel.org",
-  " arnd\@arndb.de",
-  " davem\@davemloft.net",
-  " hpa\@zytor.com",
-  " mingo\@redhat.com",
-  " oleg\@redhat.com",
-  " peterz\@infradead.org",
-  " rdunlap\@xenotime.net",
-  " mcgrathr\@chromium.org",
-  " tglx\@linutronix.de",
-  " luto\@mit.edu",
-  " eparis\@redhat.com",
-  " serge.hallyn\@canonical.com",
-  " djm\@mindrot.org",
-  " scarybeasts\@gmail.com",
-  " indan\@nul.nu",
-  " pmoore\@redhat.com",
-  " akpm\@linux-foundation.org",
-  " corbet\@lwn.net",
-  " eric.dumazet\@gmail.com",
-  " markus\@chromium.org",
-  " coreyb\@linux.vnet.ibm.com",
-  " keescook\@chromium.org",
-  " jmorris\@namei.org",
-  " Will Drewry <wad\@chromium.org>\0"
+  "Cc\0linux-man-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " linux-security-module-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " linux-arch-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " linux-doc-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " kernel-hardening-ZwoEplunGu1jrUoiu81ncdBPR1lH4CV8\@public.gmane.org",
+  " netdev-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " x86-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org",
+  " arnd-r2nGTMty4D4\@public.gmane.org",
+  " davem-fT/PcQaiUtIeIZ0/mPfg9Q\@public.gmane.org",
+  " hpa-YMNOUZJC4hwAvxtiuMwx3w\@public.gmane.org",
+  " mingo-H+wXaHxf7aLQT0dZR+AlfA\@public.gmane.org",
+  " oleg-H+wXaHxf7aLQT0dZR+AlfA\@public.gmane.org",
+  " peterz-wEGCiKHe2LqWVfeAwA7xHQ\@public.gmane.org",
+  " rdunlap-/UHa2rfvQTnk1uMJSBkQmQ\@public.gmane.org",
+  " mcgrathr-F7+t8E8rja9g9hUCZPvPmw\@public.gmane.org",
+  " tglx-hfZtesqFncYOwBW4kG4KsQ\@public.gmane.org",
+  " luto-3s7WtUTddSA\@public.gmane.org",
+  " eparis-H+wXaHxf7aLQT0dZR+AlfA\@public.gmane.org",
+  " serge.hallyn-Z7WLFzj8eWMS+FvcfC7Uqw\@public.gmane.org",
+  " djm-ilwOsaqNJrtAfugRpC6u6w\@public.gmane.org",
+  " scarybeasts-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org",
+  " indan-1J6HnF7K7zE\@public.gmane.org",
+  " pmoore-H+wXaHxf7aLQT0dZR+AlfA\@public.gmane.org",
+  " akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b\@public.gmane.org",
+  " corbet-T1hC0tSOHrs\@public.gmane.org",
+  " eric.dumazet-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org",
+  " markus-F7+t8E8rja9g9hUCZPvPmw\@public.gmane.org",
+  " coreyb-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8\@public.gmane.org",
+  " keescook-F7+t8E8rja9g9hUCZPvPmw\@public.gmane.org",
+  " jmorris-gx6/JNMH7DfYtjvyW6yDsg\@public.gmane.org",
+  " Will Drewry <wad-F7+t8E8rja9g9hUCZPvPmw\@public.gmane.org>\0"
 ]
 [
   "\0000:1\0"
@@ -58,10 +61,10 @@
   "if the arch supports compat calls.  This change allows the existing\n",
   "compat_sock_fprog be shared.\n",
   "\n",
-  "Signed-off-by: Will Drewry <wad\@chromium.org>\n",
-  "Acked-by: Serge Hallyn <serge.hallyn\@canonical.com>\n",
-  "Acked-by: Eric Dumazet <eric.dumazet\@gmail.com>\n",
-  "Acked-by: Eric Paris <eparis\@redhat.com>\n",
+  "Signed-off-by: Will Drewry <wad-F7+t8E8rja9g9hUCZPvPmw\@public.gmane.org>\n",
+  "Acked-by: Serge Hallyn <serge.hallyn-Z7WLFzj8eWMS+FvcfC7Uqw\@public.gmane.org>\n",
+  "Acked-by: Eric Dumazet <eric.dumazet-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org>\n",
+  "Acked-by: Eric Paris <eparis-H+wXaHxf7aLQT0dZR+AlfA\@public.gmane.org>\n",
   "\n",
   "v18: tasered by the apostrophe police\n",
   "v14: rebase/nochanges\n",
@@ -116,13 +119,7 @@
   "-struct compat_sock_fprog {\n",
   "-\tu16\t\tlen;\n",
   "-\tcompat_uptr_t\tfilter;\t\t/* struct sock_filter * */\n",
-  "-};\n",
-  "-\n",
-  " static int do_set_attach_filter(struct socket *sock, int level, int optname,\n",
-  " \t\t\t\tchar __user *optval, unsigned int optlen)\n",
-  " {\n",
-  "-- \n",
-  "1.7.5.4"
+  "-};"
 ]
 
-9d35ffb5d666c8ff636c98278712c9df9c8768ecff4886ebfc8701ecfc4d3882
+5d61685d7191a3c5df3e8b521e3d652fec397834186ec9478854de037b7c34d4
