diff for duplicates of <20200915142624.GA16005@lst.de>

diff --git a/a/1.txt b/N1/1.txt
index c9973d9..6c4f651 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -72,7 +72,3 @@ index 0d129421e75fc8..2b01d8f7baf160 100644
  	if (dma_map_direct(dev, ops))
  		addr = dma_direct_map_resource(dev, phys_addr, size, dir, attrs);
  	else if (ops->map_resource)
-_______________________________________________
-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 132ce69..cd1ad5e 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,11 +5,12 @@
  "Subject\0Re: [PATCH] dma-direct: Fix potential NULL pointer dereference\0"
  "Date\0Tue, 15 Sep 2020 16:26:24 +0200\0"
  "To\0Thomas Tai <thomas.tai@oracle.com>\0"
- "Cc\0konrad.wilk@oracle.com"
-  linux-kernel@vger.kernel.org
-  iommu@lists.linux-foundation.org
+ "Cc\0Christoph Hellwig <hch@lst.de>"
+  konrad.wilk@oracle.com
+  m.szyprowski@samsung.com
   robin.murphy@arm.com
- " Christoph Hellwig <hch@lst.de>\0"
+  iommu@lists.linux-foundation.org
+ " linux-kernel@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
  "On Tue, Sep 15, 2020 at 10:11:51AM -0400, Thomas Tai wrote:\n"
@@ -85,10 +86,6 @@
  "+\n"
  " \tif (dma_map_direct(dev, ops))\n"
  " \t\taddr = dma_direct_map_resource(dev, phys_addr, size, dir, attrs);\n"
- " \telse if (ops->map_resource)\n"
- "_______________________________________________\n"
- "iommu mailing list\n"
- "iommu@lists.linux-foundation.org\n"
- https://lists.linuxfoundation.org/mailman/listinfo/iommu
+ " \telse if (ops->map_resource)"
 
-019a17e821bb9742fbd39e9cb0512727e338d01415d039cf56d3ede29450ff48
+b08cb68b8e28d25415c3d9fddf823b22fcce8f5c68ad875e45bb0b8d5d4951e5
