diff for duplicates of <20190806113318.GA20215@lst.de>

diff --git a/a/1.txt b/N1/1.txt
index c418f4f..83a8fd4 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -31,8 +31,3 @@ index 59bdceea3737..c49120193309 100644
 +		*dma_handle = phys_to_dma(dev, page_to_phys(page));
  		return page;
  	}
- 
-_______________________________________________
-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 be22bdc..965614c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,10 +3,10 @@
  "Subject\0Re: Regression due to d98849aff879 (dma-direct: handle DMA_ATTR_NO_KERNEL_MAPPING in common code)\0"
  "Date\0Tue, 6 Aug 2019 13:33:18 +0200\0"
  "To\0Lucas Stach <l.stach@pengutronix.de>\0"
- "Cc\0Tom Lendacky <thomas.lendacky@amd.com>"
+ "Cc\0Christoph Hellwig <hch@lst.de>"
   iommu@lists.linux-foundation.org
-  Christoph Hellwig <hch@lst.de>
- " linux-kernel@vger.kernel.org\0"
+  linux-kernel@vger.kernel.org
+ " Tom Lendacky <thomas.lendacky@amd.com>\0"
  "\00:1\0"
  "b\0"
  "On Tue, Aug 06, 2019 at 11:13:29AM +0200, Lucas Stach wrote:\n"
@@ -41,11 +41,6 @@
  " \t\t/* return the page pointer as the opaque cookie */\n"
  "+\t\t*dma_handle = phys_to_dma(dev, page_to_phys(page));\n"
  " \t\treturn page;\n"
- " \t}\n"
- " \n"
- "_______________________________________________\n"
- "iommu mailing list\n"
- "iommu@lists.linux-foundation.org\n"
- https://lists.linuxfoundation.org/mailman/listinfo/iommu
+ " \t}"
 
-6211a23404302105481d903eb4c3787eab25b87295a4c21d7b5fdb6ea4b93d87
+43ed256085542331dfc8c2afdc26e148cd2bae64ad55a219eed0fb520623d065
