diff for duplicates of <20210510084057.GA933@lst.de>

diff --git a/a/1.txt b/N1/1.txt
index a9f89bd..f71677b 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -32,7 +32,3 @@ index 16a2b2b1c54d..7671bc153fb1 100644
  		swiotlb_force = SWIOTLB_NO_FORCE;
  
  	set_max_mapnr(max_pfn - PHYS_PFN_OFFSET);
-_______________________________________________
-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 9ce171a..b4f7719 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,14 +5,14 @@
  "Date\0Mon, 10 May 2021 10:40:57 +0200\0"
  "To\0Julien Grall <julien@xen.org>\0"
  "Cc\0f.fainelli@gmail.com"
-  Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-  osstest service owner <osstest-admin@xenproject.org>
-  linux-kernel@vger.kernel.org
-  iommu@lists.linux-foundation.org
   Stefano Stabellini <sstabellini@kernel.org>
   xen-devel@lists.xenproject.org <xen-devel@lists.xenproject.org>
+  linux-kernel@vger.kernel.org
+  osstest service owner <osstest-admin@xenproject.org>
+  hch@lst.de
+  Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
   Boris Ostrovsky <boris.ostrovsky@oracle.com>
- " hch@lst.de\0"
+ " iommu@lists.linux-foundation.org\0"
  "\00:1\0"
  "b\0"
  "On Sat, May 08, 2021 at 12:32:37AM +0100, Julien Grall wrote:\n"
@@ -48,10 +48,6 @@
  "+\telse if (!IS_ENABLED(CONFIG_XEN) || !xen_swiotlb_detect())\n"
  " \t\tswiotlb_force = SWIOTLB_NO_FORCE;\n"
  " \n"
- " \tset_max_mapnr(max_pfn - PHYS_PFN_OFFSET);\n"
- "_______________________________________________\n"
- "iommu mailing list\n"
- "iommu@lists.linux-foundation.org\n"
- https://lists.linuxfoundation.org/mailman/listinfo/iommu
+ " \tset_max_mapnr(max_pfn - PHYS_PFN_OFFSET);"
 
-58dd9b3efe360b6b7d1d40320372a9d9483399cd93a6b23228197cdd06e88bff
+70239587102bfe6d8fdcb4121af1e0d755ea4dc4eda8be6ca1bee7322bb580da
