diff for duplicates of <20160615085248.GA32390@red-moon>

diff --git a/a/1.txt b/N1/1.txt
index 687faef..e50f6ff 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -9,10 +9,10 @@ On Tue, Jun 14, 2016 at 07:39:39PM +0100, Will Deacon wrote:
 > > This patch adds the IORT IOMMU configuration for the ARM SMMU v3 kernel
 > > driver.
 > > 
-> > Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi-5wv7dgnIgG8@public.gmane.org>
-> > Cc: Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
-> > Cc: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>
-> > Cc: Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
+> > Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
+> > Cc: Will Deacon <will.deacon@arm.com>
+> > Cc: Robin Murphy <robin.murphy@arm.com>
+> > Cc: Joerg Roedel <joro@8bytes.org>
 > > ---
 > >  drivers/iommu/arm-smmu-v3.c | 101 ++++++++++++++++++++++++++++++++++++++++++++
 > >  include/linux/iort.h        |  12 +++++-
@@ -128,7 +128,7 @@ On Tue, Jun 14, 2016 at 07:39:39PM +0100, Will Deacon wrote:
 > > +#endif
 > > +
 > >  MODULE_DESCRIPTION("IOMMU API for ARM architected SMMUv3 implementations");
-> >  MODULE_AUTHOR("Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>");
+> >  MODULE_AUTHOR("Will Deacon <will.deacon@arm.com>");
 > >  MODULE_LICENSE("GPL v2");
 > > diff --git a/include/linux/iort.h b/include/linux/iort.h
 > > index ced3054..5dcfa09 100644
diff --git a/a/content_digest b/N1/content_digest
index 74accb4..0608555 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,10 +8,7 @@
   "ref\00020160614183939.GL16531\@arm.com\0"
 ]
 [
-  "ref\00020160614183939.GL16531-5wv7dgnIgG8\@public.gmane.org\0"
-]
-[
-  "From\0Lorenzo Pieralisi <lorenzo.pieralisi-5wv7dgnIgG8\@public.gmane.org>\0"
+  "From\0Lorenzo Pieralisi <lorenzo.pieralisi\@arm.com>\0"
 ]
 [
   "Subject\0Re: [RFC PATCH v2 11/15] drivers: iommu: arm-smmu-v3: add IORT iommu configuration\0"
@@ -20,20 +17,22 @@
   "Date\0Wed, 15 Jun 2016 09:52:48 +0100\0"
 ]
 [
-  "To\0Will Deacon <will.deacon-5wv7dgnIgG8\@public.gmane.org>\0"
+  "To\0Will Deacon <will.deacon\@arm.com>\0"
 ]
 [
-  "Cc\0Marc Zyngier <marc.zyngier-5wv7dgnIgG8\@public.gmane.org>",
-  " Tomasz Nowicki <tn-nYOzD4b6Jr9Wk0Htik3J/w\@public.gmane.org>",
-  " Rafael J. Wysocki <rjw-LthD3rsA81gm4RdzfppkhA\@public.gmane.org>",
-  " linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
-  " linux-pci-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
-  " Sinan Kaya <okaya-sgV2jX0FEOL9JmXXK+q4OQ\@public.gmane.org>",
-  " linux-acpi-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
-  " iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA\@public.gmane.org",
-  " Hanjun Guo <hanjun.guo-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>",
-  " Jon Masters <jcm-H+wXaHxf7aLQT0dZR+AlfA\@public.gmane.org>",
-  " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org\0"
+  "Cc\0iommu\@lists.linux-foundation.org",
+  " Robin Murphy <robin.murphy\@arm.com>",
+  " Joerg Roedel <joro\@8bytes.org>",
+  " Marc Zyngier <marc.zyngier\@arm.com>",
+  " Rafael J. Wysocki <rjw\@rjwysocki.net>",
+  " Tomasz Nowicki <tn\@semihalf.com>",
+  " Hanjun Guo <hanjun.guo\@linaro.org>",
+  " Jon Masters <jcm\@redhat.com>",
+  " Sinan Kaya <okaya\@codeaurora.org>",
+  " linux-acpi\@vger.kernel.org",
+  " linux-pci\@vger.kernel.org",
+  " linux-kernel\@vger.kernel.org",
+  " linux-arm-kernel\@lists.infradead.org\0"
 ]
 [
   "\0000:1\0"
@@ -53,10 +52,10 @@
   "> > This patch adds the IORT IOMMU configuration for the ARM SMMU v3 kernel\n",
   "> > driver.\n",
   "> > \n",
-  "> > Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi-5wv7dgnIgG8\@public.gmane.org>\n",
-  "> > Cc: Will Deacon <will.deacon-5wv7dgnIgG8\@public.gmane.org>\n",
-  "> > Cc: Robin Murphy <robin.murphy-5wv7dgnIgG8\@public.gmane.org>\n",
-  "> > Cc: Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A\@public.gmane.org>\n",
+  "> > Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi\@arm.com>\n",
+  "> > Cc: Will Deacon <will.deacon\@arm.com>\n",
+  "> > Cc: Robin Murphy <robin.murphy\@arm.com>\n",
+  "> > Cc: Joerg Roedel <joro\@8bytes.org>\n",
   "> > ---\n",
   "> >  drivers/iommu/arm-smmu-v3.c | 101 ++++++++++++++++++++++++++++++++++++++++++++\n",
   "> >  include/linux/iort.h        |  12 +++++-\n",
@@ -172,7 +171,7 @@
   "> > +#endif\n",
   "> > +\n",
   "> >  MODULE_DESCRIPTION(\"IOMMU API for ARM architected SMMUv3 implementations\");\n",
-  "> >  MODULE_AUTHOR(\"Will Deacon <will.deacon-5wv7dgnIgG8\@public.gmane.org>\");\n",
+  "> >  MODULE_AUTHOR(\"Will Deacon <will.deacon\@arm.com>\");\n",
   "> >  MODULE_LICENSE(\"GPL v2\");\n",
   "> > diff --git a/include/linux/iort.h b/include/linux/iort.h\n",
   "> > index ced3054..5dcfa09 100644\n",
@@ -222,4 +221,4 @@
   "Lorenzo"
 ]
 
-3ded45ca334796ae170a4da455b07241e408a83b6b5695995101a2425e11a670
+1d7ba02252bd3d2dad9a05245fadb1754f716ca9d746cc2f143e715ea2b00d69
