diff for duplicates of <20180227105121.7c6e1110@jacob-builder>

diff --git a/a/1.txt b/N1/1.txt
index a962c06..71697fc 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,5 +1,5 @@
 On Mon, 12 Feb 2018 18:33:31 +0000
-Jean-Philippe Brucker <jean-philippe.brucker-5wv7dgnIgG8@public.gmane.org> wrote:
+Jean-Philippe Brucker <jean-philippe.brucker@arm.com> wrote:
 
 > Add a small API within the IOMMU subsystem to handle different
 > formats of PASID tables. It uses the same principle as io-pgtable:
@@ -17,7 +17,7 @@ Jean-Philippe Brucker <jean-philippe.brucker-5wv7dgnIgG8@public.gmane.org> wrote
 > 
 > An example user will be Arm SMMU in a subsequent patch.
 > 
-> Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker-5wv7dgnIgG8@public.gmane.org>
+> Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
 > ---
 >  drivers/iommu/Kconfig       |   8 +++
 >  drivers/iommu/Makefile      |   1 +
@@ -68,7 +68,7 @@ Jean-Philippe Brucker <jean-philippe.brucker-5wv7dgnIgG8@public.gmane.org> wrote
 > + * PASID table management for the IOMMU
 > + *
 > + * Copyright (C) 2018 ARM Ltd.
-> + * Author: Jean-Philippe Brucker <jean-philippe.brucker-5wv7dgnIgG8@public.gmane.org>
+> + * Author: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
 > + *
 > + * SPDX-License-Identifier: GPL-2.0
 > + */
@@ -136,7 +136,7 @@ Jacob
 > + * PASID table management for the IOMMU
 > + *
 > + * Copyright (C) 2017 ARM Ltd.
-> + * Author: Jean-Philippe Brucker <jean-philippe.brucker-5wv7dgnIgG8@public.gmane.org>
+> + * Author: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
 > + *
 > + * SPDX-License-Identifier: GPL-2.0
 > + */
@@ -294,3 +294,8 @@ Jacob
 > +#endif /* __IOMMU_PASID_H */
 
 [Jacob Pan]
+
+_______________________________________________
+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 64be46a..7793750 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,36 +1,51 @@
  "ref\020180212183352.22730-1-jean-philippe.brucker@arm.com\0"
  "ref\020180212183352.22730-17-jean-philippe.brucker@arm.com\0"
- "ref\020180212183352.22730-17-jean-philippe.brucker-5wv7dgnIgG8@public.gmane.org\0"
- "From\0Jacob Pan <jacob.jun.pan-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>\0"
+ "From\0Jacob Pan <jacob.jun.pan@linux.intel.com>\0"
  "Subject\0Re: [PATCH 16/37] iommu: Add generic PASID table library\0"
  "Date\0Tue, 27 Feb 2018 10:51:21 -0800\0"
- "To\0Jean-Philippe Brucker <jean-philippe.brucker-5wv7dgnIgG8@public.gmane.org>\0"
- "Cc\0mark.rutland-5wv7dgnIgG8@public.gmane.org"
-  ilias.apalodimas-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org
-  kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  xuzaibo-hv44wF8Li93QT0dZR+AlfA@public.gmane.org
-  will.deacon-5wv7dgnIgG8@public.gmane.org
-  okaya-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
-  ashok.raj-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org
-  bharatku-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org
-  linux-acpi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  catalin.marinas-5wv7dgnIgG8@public.gmane.org
-  rfranz-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org
-  lenb-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
-  devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
-  bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org
-  linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
-  dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org
-  rjw-LthD3rsA81gm4RdzfppkhA@public.gmane.org
-  iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
-  sudeep.holla-5wv7dgnIgG8@public.gmane.org
- " christian.koenig-5C7GfCeVMHo@public.gmane.org\0"
+ "To\0Jean-Philippe Brucker <jean-philippe.brucker@arm.com>\0"
+ "Cc\0mark.rutland@arm.com"
+  xieyisheng1@huawei.com
+  ilias.apalodimas@linaro.org
+  kvm@vger.kernel.org
+  linux-pci@vger.kernel.org
+  xuzaibo@huawei.com
+  jonathan.cameron@huawei.com
+  will.deacon@arm.com
+  okaya@codeaurora.org
+  yi.l.liu@intel.com
+  lorenzo.pieralisi@arm.com
+  ashok.raj@intel.com
+  tn@semihalf.com
+  joro@8bytes.org
+  robdclark@gmail.com
+  bharatku@xilinx.com
+  linux-acpi@vger.kernel.org
+  catalin.marinas@arm.com
+  rfranz@cavium.com
+  lenb@kernel.org
+  devicetree@vger.kernel.org
+  jacob.jun.pan@linux.intel.com
+  alex.williamson@redhat.com
+  robh+dt@kernel.org
+  thunder.leizhen@huawei.com
+  bhelgaas@google.com
+  linux-arm-kernel@lists.infradead.org
+  shunyong.yang@hxt-semitech.com
+  dwmw2@infradead.org
+  liubo95@huawei.com
+  rjw@rjwysocki.net
+  jcrouse@codeaurora.org
+  iommu@lists.linux-foundation.org
+  hanjun.guo@linaro.org
+  sudeep.holla@arm.com
+  robin.murphy@arm.com
+  christian.koenig@amd.com
+ " nwatters@codeaurora.org\0"
  "\00:1\0"
  "b\0"
  "On Mon, 12 Feb 2018 18:33:31 +0000\n"
- "Jean-Philippe Brucker <jean-philippe.brucker-5wv7dgnIgG8@public.gmane.org> wrote:\n"
+ "Jean-Philippe Brucker <jean-philippe.brucker@arm.com> wrote:\n"
  "\n"
  "> Add a small API within the IOMMU subsystem to handle different\n"
  "> formats of PASID tables. It uses the same principle as io-pgtable:\n"
@@ -48,7 +63,7 @@
  "> \n"
  "> An example user will be Arm SMMU in a subsequent patch.\n"
  "> \n"
- "> Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker-5wv7dgnIgG8@public.gmane.org>\n"
+ "> Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>\n"
  "> ---\n"
  ">  drivers/iommu/Kconfig       |   8 +++\n"
  ">  drivers/iommu/Makefile      |   1 +\n"
@@ -99,7 +114,7 @@
  "> + * PASID table management for the IOMMU\n"
  "> + *\n"
  "> + * Copyright (C) 2018 ARM Ltd.\n"
- "> + * Author: Jean-Philippe Brucker <jean-philippe.brucker-5wv7dgnIgG8@public.gmane.org>\n"
+ "> + * Author: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>\n"
  "> + *\n"
  "> + * SPDX-License-Identifier: GPL-2.0\n"
  "> + */\n"
@@ -167,7 +182,7 @@
  "> + * PASID table management for the IOMMU\n"
  "> + *\n"
  "> + * Copyright (C) 2017 ARM Ltd.\n"
- "> + * Author: Jean-Philippe Brucker <jean-philippe.brucker-5wv7dgnIgG8@public.gmane.org>\n"
+ "> + * Author: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>\n"
  "> + *\n"
  "> + * SPDX-License-Identifier: GPL-2.0\n"
  "> + */\n"
@@ -324,6 +339,11 @@
  "> +\n"
  "> +#endif /* __IOMMU_PASID_H */\n"
  "\n"
- [Jacob Pan]
+ "[Jacob Pan]\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
 
-7deaa54932897604e777f7bc76f890f50831bcfab96d05c33758980ae93b7b93
+b456abcdb8e705d253e37437190234feed41046020d73a97c5c03cbb62315e48
