diff for duplicates of <20161121100148.24769-5-lorenzo.pieralisi@arm.com>

diff --git a/a/1.txt b/N1/1.txt
index 3303a0a..f5da84f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -18,16 +18,16 @@ usable on ACPI systems and rename the data structures and the
 registration API so that they are made to represent their usage
 more clearly.
 
-Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi-5wv7dgnIgG8@public.gmane.org>
-Acked-by: Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
-Reviewed-by: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>
-Reviewed-by: Tomasz Nowicki <tn-nYOzD4b6Jr9Wk0Htik3J/w@public.gmane.org>
-Tested-by: Hanjun Guo <hanjun.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
-Tested-by: Tomasz Nowicki <tn-nYOzD4b6Jr9Wk0Htik3J/w@public.gmane.org>
-Cc: Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
-Cc: Hanjun Guo <hanjun.guo-QSEj5FYQhm4dnm+yROfE0A@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>
+Acked-by: Will Deacon <will.deacon@arm.com>
+Reviewed-by: Robin Murphy <robin.murphy@arm.com>
+Reviewed-by: Tomasz Nowicki <tn@semihalf.com>
+Tested-by: Hanjun Guo <hanjun.guo@linaro.org>
+Tested-by: Tomasz Nowicki <tn@semihalf.com>
+Cc: Will Deacon <will.deacon@arm.com>
+Cc: Hanjun Guo <hanjun.guo@linaro.org>
+Cc: Robin Murphy <robin.murphy@arm.com>
+Cc: Joerg Roedel <joro@8bytes.org>
 ---
  drivers/iommu/iommu.c    | 40 ++++++++++++++++++++++++++++++++++++++++
  drivers/iommu/of_iommu.c | 39 ---------------------------------------
diff --git a/a/content_digest b/N1/content_digest
index 21b02f0..a066aa3 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,10 +2,7 @@
   "ref\00020161121100148.24769-1-lorenzo.pieralisi\@arm.com\0"
 ]
 [
-  "ref\00020161121100148.24769-1-lorenzo.pieralisi-5wv7dgnIgG8\@public.gmane.org\0"
-]
-[
-  "From\0Lorenzo Pieralisi <lorenzo.pieralisi-5wv7dgnIgG8\@public.gmane.org>\0"
+  "From\0Lorenzo Pieralisi <lorenzo.pieralisi\@arm.com>\0"
 ]
 [
   "Subject\0[PATCH v9 04/16] drivers: iommu: make of_iommu_set/get_ops() DT agnostic\0"
@@ -14,21 +11,27 @@
   "Date\0Mon, 21 Nov 2016 10:01:36 +0000\0"
 ]
 [
-  "To\0iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA\@public.gmane.org\0"
+  "To\0iommu\@lists.linux-foundation.org\0"
 ]
 [
-  "Cc\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
-  " linux-acpi-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
-  " Marc Zyngier <marc.zyngier-5wv7dgnIgG8\@public.gmane.org>",
-  " Rafael J. Wysocki <rjw-LthD3rsA81gm4RdzfppkhA\@public.gmane.org>",
-  " Will Deacon <will.deacon-5wv7dgnIgG8\@public.gmane.org>",
-  " linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
-  " linux-pci-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
-  " Sinan Kaya <okaya-sgV2jX0FEOL9JmXXK+q4OQ\@public.gmane.org>",
-  " Dennis Chen <dennis.chen-5wv7dgnIgG8\@public.gmane.org>",
-  " Tomasz Nowicki <tn-nYOzD4b6Jr9Wk0Htik3J/w\@public.gmane.org>",
-  " Prem Mallappa <prem.mallappa-dY08KVG/lbpWk0Htik3J/w\@public.gmane.org>",
-  " Jon Masters <jcm-H+wXaHxf7aLQT0dZR+AlfA\@public.gmane.org>\0"
+  "Cc\0Lorenzo Pieralisi <lorenzo.pieralisi\@arm.com>",
+  " Will Deacon <will.deacon\@arm.com>",
+  " Hanjun Guo <hanjun.guo\@linaro.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>",
+  " Jon Masters <jcm\@redhat.com>",
+  " Eric Auger <eric.auger\@redhat.com>",
+  " Sinan Kaya <okaya\@codeaurora.org>",
+  " Nate Watterson <nwatters\@codeaurora.org>",
+  " Prem Mallappa <prem.mallappa\@broadcom.com>",
+  " Dennis Chen <dennis.chen\@arm.com>",
+  " 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"
@@ -57,16 +60,16 @@
   "registration API so that they are made to represent their usage\n",
   "more clearly.\n",
   "\n",
-  "Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi-5wv7dgnIgG8\@public.gmane.org>\n",
-  "Acked-by: Will Deacon <will.deacon-5wv7dgnIgG8\@public.gmane.org>\n",
-  "Reviewed-by: Robin Murphy <robin.murphy-5wv7dgnIgG8\@public.gmane.org>\n",
-  "Reviewed-by: Tomasz Nowicki <tn-nYOzD4b6Jr9Wk0Htik3J/w\@public.gmane.org>\n",
-  "Tested-by: Hanjun Guo <hanjun.guo-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>\n",
-  "Tested-by: Tomasz Nowicki <tn-nYOzD4b6Jr9Wk0Htik3J/w\@public.gmane.org>\n",
-  "Cc: Will Deacon <will.deacon-5wv7dgnIgG8\@public.gmane.org>\n",
-  "Cc: Hanjun Guo <hanjun.guo-QSEj5FYQhm4dnm+yROfE0A\@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",
+  "Acked-by: Will Deacon <will.deacon\@arm.com>\n",
+  "Reviewed-by: Robin Murphy <robin.murphy\@arm.com>\n",
+  "Reviewed-by: Tomasz Nowicki <tn\@semihalf.com>\n",
+  "Tested-by: Hanjun Guo <hanjun.guo\@linaro.org>\n",
+  "Tested-by: Tomasz Nowicki <tn\@semihalf.com>\n",
+  "Cc: Will Deacon <will.deacon\@arm.com>\n",
+  "Cc: Hanjun Guo <hanjun.guo\@linaro.org>\n",
+  "Cc: Robin Murphy <robin.murphy\@arm.com>\n",
+  "Cc: Joerg Roedel <joro\@8bytes.org>\n",
   "---\n",
   " drivers/iommu/iommu.c    | 40 ++++++++++++++++++++++++++++++++++++++++\n",
   " drivers/iommu/of_iommu.c | 39 ---------------------------------------\n",
@@ -234,4 +237,4 @@
   "2.10.0"
 ]
 
-83e64a1c8c9b72280bc228bba406e1493b1ed947d71c3221f10919e21f2bf499
+3abb9660c342863186a7676e364b3a7cb7cb71232434f36c8aec0aab8ded5819
