diff for duplicates of <20201105170816.GC7502@lst.de>

diff --git a/a/1.txt b/N1/1.txt
index 3742b9c..cecfc70 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -27,7 +27,3 @@ static int rdma_rw_map_sg(struct ib_device *dev, struct scatterlist *sg,
 		return pci_p2pdma_map_sg(dev->dma_device, sg, sg_cnt, dir);
 	return ib_dma_map_sg(dev, sg, sg_cnt, dir);
 }
-_______________________________________________
-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 3db996d..6dfb221 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,16 +5,16 @@
  "Subject\0Re: [PATCH 4/6] PCI/P2PDMA: Remove the DMA_VIRT_OPS hacks\0"
  "Date\0Thu, 5 Nov 2020 18:08:16 +0100\0"
  "To\0Jason Gunthorpe <jgg@ziepe.ca>\0"
- "Cc\0Zhu Yanjun <yanjunz@nvidia.com>"
-  Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
-  linux-rdma@vger.kernel.org
-  linux-pci@vger.kernel.org
-  Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
-  iommu@lists.linux-foundation.org
+ "Cc\0Christoph Hellwig <hch@lst.de>"
   Bjorn Helgaas <bhelgaas@google.com>
   Bernard Metzler <bmt@zurich.ibm.com>
+  Zhu Yanjun <yanjunz@nvidia.com>
   Logan Gunthorpe <logang@deltatee.com>
- " Christoph Hellwig <hch@lst.de>\0"
+  Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
+  Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
+  linux-rdma@vger.kernel.org
+  linux-pci@vger.kernel.org
+ " iommu@lists.linux-foundation.org\0"
  "\00:1\0"
  "b\0"
  "On Thu, Nov 05, 2020 at 10:34:18AM -0400, Jason Gunthorpe wrote:\n"
@@ -45,10 +45,6 @@
  "\tif (is_pci_p2pdma_page(sg_page(sg)) && !ib_uses_virt_dma(dev))\n"
  "\t\treturn pci_p2pdma_map_sg(dev->dma_device, sg, sg_cnt, dir);\n"
  "\treturn ib_dma_map_sg(dev, sg, sg_cnt, dir);\n"
- "}\n"
- "_______________________________________________\n"
- "iommu mailing list\n"
- "iommu@lists.linux-foundation.org\n"
- https://lists.linuxfoundation.org/mailman/listinfo/iommu
+ }
 
-bb49b30a2eebe3616eb76e951ea0333ec2d51f855efc8880efbc7451db8d6ccc
+56581f5a8ced52490a7c1748b2fbd3ab3dda67da43cdbb4d099d9460c7283db9
