diff for duplicates of <20190417194747.GA18308@google.com>

diff --git a/a/1.txt b/N1/1.txt
index 8802e68..9fc68c2 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -5,7 +5,7 @@ On Wed, Apr 17, 2019 at 07:24:40PM +0100, Jean-Philippe Brucker wrote:
 > CONFIG_PCI_ATS which depends on CONFIG_PCI, move the definitions outside
 > of CONFIG_PCI.
 > 
-> Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker-5wv7dgnIgG8@public.gmane.org>
+> Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
 
 I guess this is OK with me, although AFAICS they're only used in
 arm_smmu_enable_ats() and arm_smmu_disable_ats() and I personally
@@ -16,7 +16,7 @@ reader, as opposed to relying on all these stub functions
 pci_disable_ats(), as well as the complete struct pci_dev declaration)
 that depend on config settings that aren't obvious in the caller.
 
-Acked-by: Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
+Acked-by: Bjorn Helgaas <bhelgaas@google.com>
 
 > ---
 >  include/linux/pci.h | 30 +++++++++++++++---------------
diff --git a/a/content_digest b/N1/content_digest
index e025daa..ceb02ae 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,21 +1,24 @@
  "ref\020190417182448.12382-1-jean-philippe.brucker@arm.com\0"
  "ref\020190417182448.12382-2-jean-philippe.brucker@arm.com\0"
- "ref\020190417182448.12382-2-jean-philippe.brucker-5wv7dgnIgG8@public.gmane.org\0"
- "From\0Bjorn Helgaas <helgaas-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0"
+ "From\0Bjorn Helgaas <helgaas@kernel.org>\0"
  "Subject\0Re: [PATCH v3 1/9] PCI: Move ATS declarations outside of CONFIG_PCI\0"
  "Date\0Wed, 17 Apr 2019 14:47:47 -0500\0"
- "To\0Jean-Philippe Brucker <jean-philippe.brucker-5wv7dgnIgG8@public.gmane.org>\0"
- "Cc\0zhongmiao-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org"
-  rjw-LthD3rsA81gm4RdzfppkhA@public.gmane.org
-  will.deacon-5wv7dgnIgG8@public.gmane.org
-  linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  linux-acpi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
-  sudeep.holla-5wv7dgnIgG8@public.gmane.org
-  okaya-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
-  robin.murphy-5wv7dgnIgG8@public.gmane.org
-  linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
- " lenb-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org\0"
+ "To\0Jean-Philippe Brucker <jean-philippe.brucker@arm.com>\0"
+ "Cc\0will.deacon@arm.com"
+  lorenzo.pieralisi@arm.com
+  iommu@lists.linux-foundation.org
+  linux-arm-kernel@lists.infradead.org
+  linux-acpi@vger.kernel.org
+  robin.murphy@arm.com
+  joro@8bytes.org
+  hanjun.guo@linaro.org
+  sudeep.holla@arm.com
+  rjw@rjwysocki.net
+  lenb@kernel.org
+  okaya@kernel.org
+  zhongmiao@hisilicon.com
+  eric.auger@redhat.com
+ " linux-pci@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
  "On Wed, Apr 17, 2019 at 07:24:40PM +0100, Jean-Philippe Brucker wrote:\n"
@@ -25,7 +28,7 @@
  "> CONFIG_PCI_ATS which depends on CONFIG_PCI, move the definitions outside\n"
  "> of CONFIG_PCI.\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"
  "I guess this is OK with me, although AFAICS they're only used in\n"
  "arm_smmu_enable_ats() and arm_smmu_disable_ats() and I personally\n"
@@ -36,7 +39,7 @@
  "pci_disable_ats(), as well as the complete struct pci_dev declaration)\n"
  "that depend on config settings that aren't obvious in the caller.\n"
  "\n"
- "Acked-by: Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>\n"
+ "Acked-by: Bjorn Helgaas <bhelgaas@google.com>\n"
  "\n"
  "> ---\n"
  ">  include/linux/pci.h | 30 +++++++++++++++---------------\n"
@@ -94,4 +97,4 @@
  "> 2.21.0\n"
  >
 
-f8ef04efcbe97b160a53ed03c56b21b1e22f93d07bba9e3a3048d9ad2cc357ce
+2e7da598b696a464a955be932b65cd149f7b8c27e8deee4d345c184a6c3de492
