diff for duplicates of <1495892865-9506-4-git-send-email-sricharan@codeaurora.org>

diff --git a/a/1.txt b/N1/1.txt
index 7e72012..a500862 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,4 +1,4 @@
-From: Laurent Pinchart <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
+From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
 
 arch_setup_dma_ops() is used in device probe code paths to create an
 IOMMU mapping and attach it to the device. The function assumes that the
@@ -33,8 +33,8 @@ it, but turn the existing dma_coherent bool field into a bitfield that
 can be used for other purposes.
 
 Fixes: 09515ef5ddad ("of/acpi: Configure dma operations at probe time for platform/amba/pci bus devices")
-Reviewed-by: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>
-Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
+Reviewed-by: Robin Murphy <robin.murphy@arm.com>
+Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
 ---
  arch/arm/include/asm/device.h | 3 ++-
  arch/arm/mm/dma-mapping.c     | 4 ++++
diff --git a/a/content_digest b/N1/content_digest
index affd2b2..70bc7fa 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,41 +1,41 @@
  "ref\01495892865-9506-1-git-send-email-sricharan@codeaurora.org\0"
- "ref\01495892865-9506-1-git-send-email-sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org\0"
- "From\0Sricharan R <sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\0"
+ "From\0Sricharan R <sricharan@codeaurora.org>\0"
  "Subject\0[PATCH v6 4/6] ARM: dma-mapping: Don't tear down third-party mappings\0"
  "Date\0Sat, 27 May 2017 19:17:43 +0530\0"
- "To\0robin.murphy-5wv7dgnIgG8@public.gmane.org"
-  will.deacon-5wv7dgnIgG8@public.gmane.org
-  joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org
-  lorenzo.pieralisi-5wv7dgnIgG8@public.gmane.org
-  iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
-  linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
-  linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org
-  bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org
-  linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  linux-acpi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  tn-nYOzD4b6Jr9Wk0Htik3J/w@public.gmane.org
-  hanjun.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org
-  okaya-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
-  robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
-  frowand.list-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
-  devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  sudeep.holla-5wv7dgnIgG8@public.gmane.org
-  rjw-LthD3rsA81gm4RdzfppkhA@public.gmane.org
-  lenb-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
-  catalin.marinas-5wv7dgnIgG8@public.gmane.org
-  arnd-r2nGTMty4D4@public.gmane.org
-  linux-arch-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org
-  j.neuschaefer-hi6Y0CQ0nG0@public.gmane.org
-  geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org
-  magnus.damm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
-  nwatters-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
- " linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org\0"
+ "To\0robin.murphy@arm.com"
+  will.deacon@arm.com
+  joro@8bytes.org
+  lorenzo.pieralisi@arm.com
+  iommu@lists.linux-foundation.org
+  linux-arm-kernel@lists.infradead.org
+  linux-arm-msm@vger.kernel.org
+  m.szyprowski@samsung.com
+  bhelgaas@google.com
+  linux-pci@vger.kernel.org
+  linux-acpi@vger.kernel.org
+  tn@semihalf.com
+  hanjun.guo@linaro.org
+  okaya@codeaurora.org
+  robh+dt@kernel.org
+  frowand.list@gmail.com
+  devicetree@vger.kernel.org
+  linux-kernel@vger.kernel.org
+  sudeep.holla@arm.com
+  rjw@rjwysocki.net
+  lenb@kernel.org
+  catalin.marinas@arm.com
+  arnd@arndb.de
+  linux-arch@vger.kernel.org
+  laurent.pinchart@ideasonboard.com
+  j.neuschaefer@gmx.net
+  geert@linux-m68k.org
+  magnus.damm@gmail.com
+  nwatters@codeaurora.org
+ " linux@armlinux.org.uk\0"
+ "Cc\0sricharan@codeaurora.org\0"
  "\00:1\0"
  "b\0"
- "From: Laurent Pinchart <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>\n"
+ "From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>\n"
  "\n"
  "arch_setup_dma_ops() is used in device probe code paths to create an\n"
  "IOMMU mapping and attach it to the device. The function assumes that the\n"
@@ -70,8 +70,8 @@
  "can be used for other purposes.\n"
  "\n"
  "Fixes: 09515ef5ddad (\"of/acpi: Configure dma operations at probe time for platform/amba/pci bus devices\")\n"
- "Reviewed-by: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>\n"
- "Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>\n"
+ "Reviewed-by: Robin Murphy <robin.murphy@arm.com>\n"
+ "Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>\n"
  "---\n"
  " arch/arm/include/asm/device.h | 3 ++-\n"
  " arch/arm/mm/dma-mapping.c     | 4 ++++\n"
@@ -112,4 +112,4 @@
  "-- \n"
  QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
 
-2b7d56b8b02d13dac578d355914571e01b4bfa4abc43f74bd348e1546d548b51
+fc73c654ee6ba612df8665aa376d3434711d14070cbdd5b1fe095ef36f3ba6b5
