diff for duplicates of <20150511143025.GD20282@l.oracle.com>

diff --git a/a/1.txt b/N1/1.txt
index 86efe73..aa5bff1 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,14 +1,14 @@
 On Thu, May 07, 2015 at 10:19:05AM -0500, Bjorn Helgaas wrote:
 > [+cc Dave for sparc64, Yinghai]
 > 
-> On Fri, May 01, 2015 at 01:32:15PM -0500, wdavis-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org wrote:
-> > From: Will Davis <wdavis-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
+> On Fri, May 01, 2015 at 01:32:15PM -0500, wdavis@nvidia.com wrote:
+> > From: Will Davis <wdavis@nvidia.com>
 > > 
 > > Simply route these through to the new dma_(un)map_resource APIs.
 > > 
-> > Signed-off-by: Will Davis <wdavis-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
-> > Reviewed-by: Terence Ripperda <tripperda-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
-> > Reviewed-by: John Hubbard <jhubbard-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
+> > Signed-off-by: Will Davis <wdavis@nvidia.com>
+> > Reviewed-by: Terence Ripperda <tripperda@nvidia.com>
+> > Reviewed-by: John Hubbard <jhubbard@nvidia.com>
 > > ---
 > >  include/asm-generic/pci-dma-compat.h | 14 ++++++++++++++
 > >  1 file changed, 14 insertions(+)
@@ -42,9 +42,9 @@ the T5-8 box)?
 > 
 > Bjorn
 > 
-> [1] http://lkml.kernel.org/r/20150327.145016.86183910134380870.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org
-> [2] http://lkml.kernel.org/r/1427857069-6789-2-git-send-email-yinghai-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
+> [1] http://lkml.kernel.org/r/20150327.145016.86183910134380870.davem@davemloft.net
+> [2] http://lkml.kernel.org/r/1427857069-6789-2-git-send-email-yinghai@kernel.org
 > _______________________________________________
 > 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 37527a7..871f622 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,32 +1,31 @@
  "ref\01430505138-2877-1-git-send-email-wdavis@nvidia.com\0"
  "ref\01430505138-2877-4-git-send-email-wdavis@nvidia.com\0"
  "ref\020150507151905.GL24643@google.com\0"
- "ref\020150507151905.GL24643-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org\0"
- "From\0Konrad Rzeszutek Wilk <konrad.wilk-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>\0"
+ "From\0Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>\0"
  "Subject\0Re: [PATCH 3/6] dma-mapping: pci: add pci_(un)map_resource\0"
  "Date\0Mon, 11 May 2015 10:30:25 -0400\0"
- "To\0Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>\0"
- "Cc\0linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
-  iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
-  wdavis-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org
-  jglisse-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
-  jhubbard-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org
-  tripperda-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org
-  Yinghai Lu <yinghai-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
- " David S. Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>\0"
+ "To\0Bjorn Helgaas <bhelgaas@google.com>\0"
+ "Cc\0wdavis@nvidia.com"
+  linux-pci@vger.kernel.org
+  iommu@lists.linux-foundation.org
+  jglisse@redhat.com
+  jhubbard@nvidia.com
+  tripperda@nvidia.com
+  Yinghai Lu <yinghai@kernel.org>
+ " David S. Miller <davem@davemloft.net>\0"
  "\00:1\0"
  "b\0"
  "On Thu, May 07, 2015 at 10:19:05AM -0500, Bjorn Helgaas wrote:\n"
  "> [+cc Dave for sparc64, Yinghai]\n"
  "> \n"
- "> On Fri, May 01, 2015 at 01:32:15PM -0500, wdavis-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org wrote:\n"
- "> > From: Will Davis <wdavis-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\n"
+ "> On Fri, May 01, 2015 at 01:32:15PM -0500, wdavis@nvidia.com wrote:\n"
+ "> > From: Will Davis <wdavis@nvidia.com>\n"
  "> > \n"
  "> > Simply route these through to the new dma_(un)map_resource APIs.\n"
  "> > \n"
- "> > Signed-off-by: Will Davis <wdavis-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\n"
- "> > Reviewed-by: Terence Ripperda <tripperda-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\n"
- "> > Reviewed-by: John Hubbard <jhubbard-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\n"
+ "> > Signed-off-by: Will Davis <wdavis@nvidia.com>\n"
+ "> > Reviewed-by: Terence Ripperda <tripperda@nvidia.com>\n"
+ "> > Reviewed-by: John Hubbard <jhubbard@nvidia.com>\n"
  "> > ---\n"
  "> >  include/asm-generic/pci-dma-compat.h | 14 ++++++++++++++\n"
  "> >  1 file changed, 14 insertions(+)\n"
@@ -60,11 +59,11 @@
  "> \n"
  "> Bjorn\n"
  "> \n"
- "> [1] http://lkml.kernel.org/r/20150327.145016.86183910134380870.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org\n"
- "> [2] http://lkml.kernel.org/r/1427857069-6789-2-git-send-email-yinghai-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org\n"
+ "> [1] http://lkml.kernel.org/r/20150327.145016.86183910134380870.davem@davemloft.net\n"
+ "> [2] http://lkml.kernel.org/r/1427857069-6789-2-git-send-email-yinghai@kernel.org\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
 
-2ca8735d81de552b39f6ffddb88e0f0a42a20c8157a19560c37ca24bbfd8e5b0
+cc11b704071cc73c2a6f2fe125f94afb7ae945509f10bf59829e302bf27f7e43
