diff for duplicates of <20191220150315.GA97598@google.com>

diff --git a/a/1.txt b/N1/1.txt
index f29d67a..f76beb0 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -32,8 +32,3 @@ On Fri, Dec 20, 2019 at 09:43:03AM +0100, Joerg Roedel wrote:
 Yep, thanks!  You can add my
 
 Acked-by: Bjorn Helgaas <bhelgaas@google.com>
-
-_______________________________________________
-iommu mailing list
-iommu@lists.linux-foundation.org
-https://lists.linuxfoundation.org/mailman/listinfo/iommu
diff --git a/a/content_digest b/N1/content_digest
index 8540282..1c8564e 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,18 +3,21 @@
  "Subject\0Re: [PATCH v4 03/16] PCI/ATS: Restore EXPORT_SYMBOL_GPL() for pci_{enable,disable}_ats()\0"
  "Date\0Fri, 20 Dec 2019 09:03:15 -0600\0"
  "To\0Joerg Roedel <joro@8bytes.org>\0"
- "Cc\0iommu@lists.linuxfoundation.org"
+ "Cc\0Will Deacon <will@kernel.org>"
+  linux-kernel@vger.kernel.org
+  iommu@lists.linuxfoundation.org
+  kernel-team@android.com
   Jean-Philippe Brucker <jean-philippe@linaro.org>
+  Jordan Crouse <jcrouse@codeaurora.org>
+  John Garry <john.garry@huawei.com>
   Saravana Kannan <saravanak@google.com>
-  Will Deacon <will@kernel.org>
-  linux-kernel@vger.kernel.org
-  Ard Biesheuvel <ardb@kernel.org>
-  Joerg Roedel <jroedel@suse.de>
   Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-  Greg Kroah-Hartman <gregkh@google.com>
-  kernel-team@android.com
   Isaac J. Manjarres <isaacm@codeaurora.org>
- " Robin Murphy <robin.murphy@arm.com>\0"
+  Robin Murphy <robin.murphy@arm.com>
+  Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
+  Ard Biesheuvel <ardb@kernel.org>
+  Greg Kroah-Hartman <gregkh@google.com>
+ " Joerg Roedel <jroedel@suse.de>\0"
  "\00:1\0"
  "b\0"
  "On Fri, Dec 20, 2019 at 09:43:03AM +0100, Joerg Roedel wrote:\n"
@@ -50,11 +53,6 @@
  "\n"
  "Yep, thanks!  You can add my\n"
  "\n"
- "Acked-by: Bjorn Helgaas <bhelgaas@google.com>\n"
- "\n"
- "_______________________________________________\n"
- "iommu mailing list\n"
- "iommu@lists.linux-foundation.org\n"
- https://lists.linuxfoundation.org/mailman/listinfo/iommu
+ Acked-by: Bjorn Helgaas <bhelgaas@google.com>
 
-a3ab29a083de6524539c5b7f3aaf9612f546f399a06ffe20b179ca4a86748bf4
+fc2f230bf4219c07cb870165fbaa8a4eeb0f10f74d467e846d400b8e022232b0
