diff for duplicates of <1900421.tkAiezvoW8@avalon>

diff --git a/a/1.txt b/N1/1.txt
index 6d16fb1..356faff 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -4,7 +4,7 @@ On Wednesday 03 May 2017 15:54:59 Sricharan R wrote:
 > On 5/3/2017 3:24 PM, Robin Murphy wrote:
 > > On 02/05/17 19:35, Geert Uytterhoeven wrote:
 > >> On Fri, Feb 3, 2017 at 4:48 PM, Sricharan R wrote:
-> >>> From: Laurent Pinchart <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
+> >>> From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
 > >>> 
 > >>> Failures to look up an IOMMU when parsing the DT iommus property need to
 > >>> be handled separately from the .of_xlate() failures to support deferred
@@ -28,10 +28,10 @@ On Wednesday 03 May 2017 15:54:59 Sricharan R wrote:
 > >>> on whether the IOMMU is optional or mandatory would be a good
 > >>> enhancement.
 > >>> 
-> >>> Tested-by: Marek Szyprowski <m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
+> >>> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
 > >>> Signed-off-by: Laurent Pichart
-> >>> <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
-> >>> Signed-off-by: Sricharan R <sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
+> >>> <laurent.pinchart+renesas@ideasonboard.com>
+> >>> Signed-off-by: Sricharan R <sricharan@codeaurora.org>
 > >> 
 > >> This patch broke Renesas R-Car Gen3 platforms in renesas-drivers.
 > >> As the IOMMU nodes in DT are not yet enabled, all devices having iommus
@@ -54,7 +54,7 @@ On Wednesday 03 May 2017 15:54:59 Sricharan R wrote:
 > situation ?
 > 
 > From 499b6e662f60f23740b8880882b0a16f16434501 Mon Sep 17 00:00:00 2001
-> From: Sricharan R <sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
+> From: Sricharan R <sricharan@codeaurora.org>
 > Date: Wed, 3 May 2017 13:16:59 +0530
 > Subject: [PATCH] iommu: of: Fix check for returning EPROBE_DEFER
 > 
@@ -64,7 +64,7 @@ On Wednesday 03 May 2017 15:54:59 Sricharan R wrote:
 > simply return NULL and let the master's probe
 > continue rather than deferring.
 > 
-> Signed-off-by: Sricharan R <sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
+> Signed-off-by: Sricharan R <sricharan@codeaurora.org>
 > ---
 >  drivers/iommu/of_iommu.c | 1 +
 >  1 file changed, 1 insertion(+)
@@ -101,3 +101,9 @@ nice to check existing IOMMU drivers before merging this patch series...
 Regards,
 
 Laurent Pinchart
+
+
+_______________________________________________
+linux-arm-kernel mailing list
+linux-arm-kernel@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index e666d8b..f72a20a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,23 +1,27 @@
  "ref\01486136933-20328-1-git-send-email-sricharan@codeaurora.org\0"
  "ref\02bfd11dc-9f94-2b69-7b03-c640e53155e1@arm.com\0"
  "ref\026defadf-6380-4af4-6323-b51198376bc1@codeaurora.org\0"
- "ref\026defadf-6380-4af4-6323-b51198376bc1-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org\0"
- "From\0Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>\0"
+ "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0"
  "Subject\0Re: [PATCH V8 07/11] iommu: of: Handle IOMMU lookup failure with deferred probing or error\0"
  "Date\0Mon, 15 May 2017 23:37:16 +0300\0"
- "To\0Sricharan R <sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\0"
- "Cc\0Linux-Renesas <linux-renesas-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>"
-  Magnus Damm <magnus.damm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
-  linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
-  Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
-  okaya-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
-  ACPI Devel Maling List <linux-acpi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
-  iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
-  Geert Uytterhoeven <geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>
-  linux-pci <linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
-  Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
-  tn-nYOzD4b6Jr9Wk0Htik3J/w@public.gmane.org
- " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>\0"
+ "To\0Sricharan R <sricharan@codeaurora.org>\0"
+ "Cc\0Linux-Renesas <linux-renesas-soc@vger.kernel.org>"
+  Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
+  Magnus Damm <magnus.damm@gmail.com>
+  linux-arm-msm@vger.kernel.org <linux-arm-msm@vger.kernel.org>
+  Joerg Roedel <joro@8bytes.org>
+  Will Deacon <will.deacon@arm.com>
+  okaya@codeaurora.org
+  ACPI Devel Maling List <linux-acpi@vger.kernel.org>
+  iommu@lists.linux-foundation.org
+  Geert Uytterhoeven <geert@linux-m68k.org>
+  Hanjun Guo <hanjun.guo@linaro.org>
+  linux-pci <linux-pci@vger.kernel.org>
+  Bjorn Helgaas <bhelgaas@google.com>
+  tn@semihalf.com
+  Robin Murphy <robin.murphy@arm.com>
+  linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>
+ " Marek Szyprowski <m.szyprowski@samsung.com>\0"
  "\00:1\0"
  "b\0"
  "Hi Sricharan,\n"
@@ -26,7 +30,7 @@
  "> On 5/3/2017 3:24 PM, Robin Murphy wrote:\n"
  "> > On 02/05/17 19:35, Geert Uytterhoeven wrote:\n"
  "> >> On Fri, Feb 3, 2017 at 4:48 PM, Sricharan R wrote:\n"
- "> >>> From: Laurent Pinchart <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>\n"
+ "> >>> From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>\n"
  "> >>> \n"
  "> >>> Failures to look up an IOMMU when parsing the DT iommus property need to\n"
  "> >>> be handled separately from the .of_xlate() failures to support deferred\n"
@@ -50,10 +54,10 @@
  "> >>> on whether the IOMMU is optional or mandatory would be a good\n"
  "> >>> enhancement.\n"
  "> >>> \n"
- "> >>> Tested-by: Marek Szyprowski <m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>\n"
+ "> >>> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>\n"
  "> >>> Signed-off-by: Laurent Pichart\n"
- "> >>> <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>\n"
- "> >>> Signed-off-by: Sricharan R <sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\n"
+ "> >>> <laurent.pinchart+renesas@ideasonboard.com>\n"
+ "> >>> Signed-off-by: Sricharan R <sricharan@codeaurora.org>\n"
  "> >> \n"
  "> >> This patch broke Renesas R-Car Gen3 platforms in renesas-drivers.\n"
  "> >> As the IOMMU nodes in DT are not yet enabled, all devices having iommus\n"
@@ -76,7 +80,7 @@
  "> situation ?\n"
  "> \n"
  "> From 499b6e662f60f23740b8880882b0a16f16434501 Mon Sep 17 00:00:00 2001\n"
- "> From: Sricharan R <sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\n"
+ "> From: Sricharan R <sricharan@codeaurora.org>\n"
  "> Date: Wed, 3 May 2017 13:16:59 +0530\n"
  "> Subject: [PATCH] iommu: of: Fix check for returning EPROBE_DEFER\n"
  "> \n"
@@ -86,7 +90,7 @@
  "> simply return NULL and let the master's probe\n"
  "> continue rather than deferring.\n"
  "> \n"
- "> Signed-off-by: Sricharan R <sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\n"
+ "> Signed-off-by: Sricharan R <sricharan@codeaurora.org>\n"
  "> ---\n"
  ">  drivers/iommu/of_iommu.c | 1 +\n"
  ">  1 file changed, 1 insertion(+)\n"
@@ -122,6 +126,12 @@
  "-- \n"
  "Regards,\n"
  "\n"
- Laurent Pinchart
+ "Laurent Pinchart\n"
+ "\n"
+ "\n"
+ "_______________________________________________\n"
+ "linux-arm-kernel mailing list\n"
+ "linux-arm-kernel@lists.infradead.org\n"
+ http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
-aefd14ab7dabccacd57369b0e9008fd9c8e5783cc8e779603154dcbd5bdf0f6a
+ee0fe358f72911905fd6ea7a590b608114ce8479926b73e3487a484af649436b
