diff for duplicates of <alpine.DEB.2.02.1511121634040.526@kaball.uk.xensource.com>

diff --git a/a/1.txt b/N1/1.txt
index 8d55584..72a542e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -5,9 +5,9 @@ On Thu, 12 Nov 2015, Boris Ostrovsky wrote:
 > > 
 > > Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
 > > Acked-by: Arnd Bergmann <arnd@arndb.de>
-> > CC: konrad.wilk@oracle.com
-> > CC: david.vrabel@citrix.com
-> > CC: boris.ostrovsky@oracle.com
+> > CC: konrad.wilk at oracle.com
+> > CC: david.vrabel at citrix.com
+> > CC: boris.ostrovsky at oracle.com
 > > ---
 > >   arch/x86/xen/time.c              |    8 ++++----
 > >   include/xen/interface/platform.h |   18 ++++++++++++++----
@@ -69,7 +69,7 @@ end of the series.
 > > +};
 > > +DEFINE_GUEST_HANDLE_STRUCT(xenpf_settime64_t);
 > >     /*
-> >    * Request memory range (@mfn, @mfn+@nr_mfns-1) to have type @type.
+> >    * Request memory range (@mfn, @mfn+ at nr_mfns-1) to have type @type.
 > > @@ -495,7 +504,8 @@ struct xen_platform_op {
 > >   	uint32_t cmd;
 > >   	uint32_t interface_version; /* XENPF_INTERFACE_VERSION */
diff --git a/a/content_digest b/N1/content_digest
index 9c88ef3..1c4a992 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,26 +8,16 @@
   "ref\0005644B08F.9000205\@oracle.com\0"
 ]
 [
-  "From\0Stefano Stabellini <stefano.stabellini\@eu.citrix.com>\0"
+  "From\0stefano.stabellini\@eu.citrix.com (Stefano Stabellini)\0"
 ]
 [
-  "Subject\0Re: [PATCH v3 3/6] xen: introduce XENPF_settime64\0"
+  "Subject\0[PATCH v3 3/6] xen: introduce XENPF_settime64\0"
 ]
 [
   "Date\0Thu, 12 Nov 2015 16:34:36 +0000\0"
 ]
 [
-  "To\0Boris Ostrovsky <boris.ostrovsky\@oracle.com>\0"
-]
-[
-  "Cc\0Stefano Stabellini <stefano.stabellini\@eu.citrix.com>",
-  " <xen-devel\@lists.xensource.com>",
-  " <linux-arm-kernel\@lists.infradead.org>",
-  " <Ian.Campbell\@citrix.com>",
-  " <linux-kernel\@vger.kernel.org>",
-  " Arnd Bergmann <arnd\@arndb.de>",
-  " <konrad.wilk\@oracle.com>",
-  " <david.vrabel\@citrix.com>\0"
+  "To\0linux-arm-kernel\@lists.infradead.org\0"
 ]
 [
   "\0000:1\0"
@@ -43,9 +33,9 @@
   "> > \n",
   "> > Signed-off-by: Stefano Stabellini <stefano.stabellini\@eu.citrix.com>\n",
   "> > Acked-by: Arnd Bergmann <arnd\@arndb.de>\n",
-  "> > CC: konrad.wilk\@oracle.com\n",
-  "> > CC: david.vrabel\@citrix.com\n",
-  "> > CC: boris.ostrovsky\@oracle.com\n",
+  "> > CC: konrad.wilk at oracle.com\n",
+  "> > CC: david.vrabel at citrix.com\n",
+  "> > CC: boris.ostrovsky at oracle.com\n",
   "> > ---\n",
   "> >   arch/x86/xen/time.c              |    8 ++++----\n",
   "> >   include/xen/interface/platform.h |   18 ++++++++++++++----\n",
@@ -107,7 +97,7 @@
   "> > +};\n",
   "> > +DEFINE_GUEST_HANDLE_STRUCT(xenpf_settime64_t);\n",
   "> >     /*\n",
-  "> >    * Request memory range (\@mfn, \@mfn+\@nr_mfns-1) to have type \@type.\n",
+  "> >    * Request memory range (\@mfn, \@mfn+ at nr_mfns-1) to have type \@type.\n",
   "> > \@\@ -495,7 +504,8 \@\@ struct xen_platform_op {\n",
   "> >   \tuint32_t cmd;\n",
   "> >   \tuint32_t interface_version; /* XENPF_INTERFACE_VERSION */\n",
@@ -121,4 +111,4 @@
   ">"
 ]
 
-238eef6299074aaaeaeedaeaf6fed5bc4a54193949b1affcf193e1f55e6f7ce6
+5f5ef125f3b7f6ff8bc37d1b6b66b82bf6b1611e8ed98da3921d315155b317d2
