diff for duplicates of <5711177E.2000509@arm.com>

diff --git a/a/1.txt b/N1/1.txt
index fe1cf83..4b9627a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -25,17 +25,17 @@ On 15/04/16 17:14, Bjorn Helgaas wrote:
 >> as of_dma_configure on ARM systems and leaving behaviour unchanged
 >> for all other arches.
 >>
->> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi-5wv7dgnIgG8@public.gmane.org>
->> Cc: Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
->> Cc: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>
->> Cc: Tomasz Nowicki <tn-nYOzD4b6Jr9Wk0Htik3J/w@public.gmane.org>
->> Cc: Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
->> Cc: "Rafael J. Wysocki" <rjw-LthD3rsA81gm4RdzfppkhA@public.gmane.org>
+>> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
+>> Cc: Bjorn Helgaas <bhelgaas@google.com>
+>> Cc: Robin Murphy <robin.murphy@arm.com>
+>> Cc: Tomasz Nowicki <tn@semihalf.com>
+>> Cc: Joerg Roedel <joro@8bytes.org>
+>> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
 >
 > There's only a tiny PCI change in this series, so I assume somebody
 > else will merge all this.  Here's my ack for the PCI part:
 >
-> Acked-by: Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>	# for drivers/pci/probe.c change
+> Acked-by: Bjorn Helgaas <bhelgaas@google.com>	# for drivers/pci/probe.c change
 >
 > One question on use of pci_for_each_dma_alias() below.
 >
@@ -109,6 +109,6 @@ Robin.
 >> +}
 > _______________________________________________
 > iommu mailing list
-> iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
+> iommu@lists.linux-foundation.org
 > https://lists.linuxfoundation.org/mailman/listinfo/iommu
 >
diff --git a/a/content_digest b/N1/content_digest
index 613aa2c..6da35cf 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,24 +1,24 @@
  "ref\01460654743-7896-1-git-send-email-lorenzo.pieralisi@arm.com\0"
  "ref\01460654743-7896-10-git-send-email-lorenzo.pieralisi@arm.com\0"
  "ref\020160415161400.GC7973@localhost\0"
- "From\0Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>\0"
+ "From\0Robin Murphy <robin.murphy@arm.com>\0"
  "Subject\0Re: [RFC PATCH 09/11] drivers: acpi: implement acpi_dma_configure\0"
  "Date\0Fri, 15 Apr 2016 17:31:58 +0100\0"
- "To\0Bjorn Helgaas <helgaas-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>"
- " Lorenzo Pieralisi <lorenzo.pieralisi-5wv7dgnIgG8@public.gmane.org>\0"
- "Cc\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org"
-  Marc 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
-  Will Deacon <will.deacon-5wv7dgnIgG8@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>
-  linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
- " Jon Masters <jcm-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0"
+ "To\0Bjorn Helgaas <helgaas@kernel.org>"
+ " Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>\0"
+ "Cc\0Marc Zyngier <marc.zyngier@arm.com>"
+  Tomasz Nowicki <tn@semihalf.com>
+  Rafael J. Wysocki <rjw@rjwysocki.net>
+  linux-kernel@vger.kernel.org
+  Will Deacon <will.deacon@arm.com>
+  linux-pci@vger.kernel.org
+  Sinan Kaya <okaya@codeaurora.org>
+  linux-acpi@vger.kernel.org
+  iommu@lists.linux-foundation.org
+  Hanjun Guo <hanjun.guo@linaro.org>
+  Jon Masters <jcm@redhat.com>
+  Bjorn Helgaas <bhelgaas@google.com>
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Hi Bjorn,\n"
@@ -48,17 +48,17 @@
  ">> as of_dma_configure on ARM systems and leaving behaviour unchanged\n"
  ">> for all other arches.\n"
  ">>\n"
- ">> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi-5wv7dgnIgG8@public.gmane.org>\n"
- ">> Cc: Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>\n"
- ">> Cc: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>\n"
- ">> Cc: Tomasz Nowicki <tn-nYOzD4b6Jr9Wk0Htik3J/w@public.gmane.org>\n"
- ">> Cc: Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>\n"
- ">> Cc: \"Rafael J. Wysocki\" <rjw-LthD3rsA81gm4RdzfppkhA@public.gmane.org>\n"
+ ">> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>\n"
+ ">> Cc: Bjorn Helgaas <bhelgaas@google.com>\n"
+ ">> Cc: Robin Murphy <robin.murphy@arm.com>\n"
+ ">> Cc: Tomasz Nowicki <tn@semihalf.com>\n"
+ ">> Cc: Joerg Roedel <joro@8bytes.org>\n"
+ ">> Cc: \"Rafael J. Wysocki\" <rjw@rjwysocki.net>\n"
  ">\n"
  "> There's only a tiny PCI change in this series, so I assume somebody\n"
  "> else will merge all this.  Here's my ack for the PCI part:\n"
  ">\n"
- "> Acked-by: Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>\t# for drivers/pci/probe.c change\n"
+ "> Acked-by: Bjorn Helgaas <bhelgaas@google.com>\t# for drivers/pci/probe.c change\n"
  ">\n"
  "> One question on use of pci_for_each_dma_alias() below.\n"
  ">\n"
@@ -132,8 +132,8 @@
  ">> +}\n"
  "> _______________________________________________\n"
  "> iommu mailing list\n"
- "> iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org\n"
+ "> iommu@lists.linux-foundation.org\n"
  "> https://lists.linuxfoundation.org/mailman/listinfo/iommu\n"
  >
 
-23e92b398dd4f0e54c6b7adfb23ddbf9ea14f30fc2842913d98193814d42447c
+8b9de1a6484f8b7a6e5199baebfd3b6e20a9d0aaa2cb89b5cb49013fed1d09e6
