diff for duplicates of <4484f88d5ce342a3a27a00ef12869acc@codeaurora.org>

diff --git a/a/1.txt b/N1/1.txt
index 8b4a359..ae684dc 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -5,7 +5,7 @@ On 2017-05-16 19:40, Laurent Pinchart wrote:
 > 
 > On Tuesday 16 May 2017 15:04:55 Robin Murphy wrote:
 >> On 16/05/17 08:17, Laurent Pinchart wrote:
->> > On Tuesday 16 May 2017 07:53:57 sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org wrote:
+>> > On Tuesday 16 May 2017 07:53:57 sricharan@codeaurora.org wrote:
 > 
 > [snip]
 > 
@@ -16,8 +16,8 @@ On 2017-05-16 19:40, Laurent Pinchart wrote:
 >> >> after EPROBEDEFER error, but on the next try dma_ops will still
 >> >> be set to old value, which is not right.
 >> >>
->> >> Signed-off-by: Sricharan R <sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
->> >> Reviewed-by: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>
+>> >> Signed-off-by: Sricharan R <sricharan@codeaurora.org>
+>> >> Reviewed-by: Robin Murphy <robin.murphy@arm.com>
 >> >> ---
 >> >>
 >> >>   arch/arm/mm/dma-mapping.c | 1 +
@@ -75,7 +75,7 @@ On 2017-05-16 19:40, Laurent Pinchart wrote:
 > states
 > 
 > commit 26b37b946a5c2658dbc37dd5d6df40aaa9685d70 (iommu-joerg/arm/core)
-> Author: Laurent Pinchart <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
+> Author: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
 > Date:   Fri May 15 02:00:02 2015 +0300
 > 
 >     arm: dma-mapping: Don't override dma_ops in arch_setup_dma_ops()
@@ -115,3 +115,8 @@ that path in the iommu driver which called those functions is not
 replayed.
 
 Regards,
+
+_______________________________________________
+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 d00fdda..6be8ee2 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,23 +2,28 @@
  "ref\01924197.MWBQ7kvoOo@avalon\0"
  "ref\05724f819-40db-e830-1ec1-62c887ba39ee@arm.com\0"
  "ref\01825810.fLbCv8umR7@avalon\0"
- "From\0sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org\0"
+ "From\0sricharan@codeaurora.org\0"
  "Subject\0Re: [PATCH V8 07/11] iommu: of: Handle IOMMU lookup failure with deferred probing or error\0"
  "Date\0Tue, 16 May 2017 19:59:01 +0530\0"
- "To\0Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>\0"
- "Cc\0okaya-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org"
-  linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  Magnus Damm <magnus.damm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
-  Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
-  Linux-Renesas <linux-renesas-soc-u79uwXL29TY76Z2rM5mHXA@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-msm-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
- " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0"
+ "To\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0"
+ "Cc\0okaya@codeaurora.org"
+  Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
+  linux-arm-msm@vger.kernel.org
+  Joerg Roedel <joro@8bytes.org>
+  Magnus Damm <magnus.damm@gmail.com>
+  Will Deacon <will.deacon@arm.com>
+  Linux-Renesas <linux-renesas-soc@vger.kernel.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-msm-owner@vger.kernel.org
+  linux-arm-kernel@lists.infradead.org
+ " Marek Szyprowski <m.szyprowski@samsung.com>\0"
  "\00:1\0"
  "b\0"
  "Hi,\n"
@@ -28,7 +33,7 @@
  "> \n"
  "> On Tuesday 16 May 2017 15:04:55 Robin Murphy wrote:\n"
  ">> On 16/05/17 08:17, Laurent Pinchart wrote:\n"
- ">> > On Tuesday 16 May 2017 07:53:57 sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org wrote:\n"
+ ">> > On Tuesday 16 May 2017 07:53:57 sricharan@codeaurora.org wrote:\n"
  "> \n"
  "> [snip]\n"
  "> \n"
@@ -39,8 +44,8 @@
  ">> >> after EPROBEDEFER error, but on the next try dma_ops will still\n"
  ">> >> be set to old value, which is not right.\n"
  ">> >>\n"
- ">> >> Signed-off-by: Sricharan R <sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\n"
- ">> >> Reviewed-by: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>\n"
+ ">> >> Signed-off-by: Sricharan R <sricharan@codeaurora.org>\n"
+ ">> >> Reviewed-by: Robin Murphy <robin.murphy@arm.com>\n"
  ">> >> ---\n"
  ">> >>\n"
  ">> >>   arch/arm/mm/dma-mapping.c | 1 +\n"
@@ -98,7 +103,7 @@
  "> states\n"
  "> \n"
  "> commit 26b37b946a5c2658dbc37dd5d6df40aaa9685d70 (iommu-joerg/arm/core)\n"
- "> Author: Laurent Pinchart <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>\n"
+ "> Author: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>\n"
  "> Date:   Fri May 15 02:00:02 2015 +0300\n"
  "> \n"
  ">     arm: dma-mapping: Don't override dma_ops in arch_setup_dma_ops()\n"
@@ -137,6 +142,11 @@
  "that path in the iommu driver which called those functions is not\n"
  "replayed.\n"
  "\n"
- Regards,
+ "Regards,\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
 
-058b965881f0183fb7e91fb0aff37c0c11d3e8428a2399f64ed65172d4002bda
+1db9b5a54937d2737f1977c5c207916da0ecf7bddfb67db2c30c02db42f8edc3
