diff for duplicates of <20190430111222.GA3191@infradead.org>

diff --git a/a/1.txt b/N1/1.txt
index 1b05616..eca0406 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -19,8 +19,8 @@ should probably always use a 64-bit mask.  Or we could just untangle
 it from the DMA mapping fast path entire, something like:
 
 ---
->From 0debafc85174ca830f2e371ff8e8f7465bde3ad8 Mon Sep 17 00:00:00 2001
-From: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>
+From 0debafc85174ca830f2e371ff8e8f7465bde3ad8 Mon Sep 17 00:00:00 2001
+From: Christoph Hellwig <hch@lst.de>
 Date: Tue, 30 Apr 2019 07:06:23 -0400
 Subject: iommu/dma: opencode __iommu_dma_map in iommu_dma_get_msi_page
 
@@ -28,7 +28,7 @@ The MSI page mapping really is a little different from the normal DMA
 mappings and doesn't need to look at the DMA mask.  Just open code
 it instead of trying to squeeze the behavior into the DMA path helpers.
 
-Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
 ---
  drivers/iommu/dma-iommu.c | 27 +++++++--------------------
  1 file changed, 7 insertions(+), 20 deletions(-)
@@ -109,3 +109,8 @@ index 58c35bab7626..2ac0df0879d7 100644
  	return NULL;
 -- 
 2.20.1
+
+_______________________________________________
+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 be16cf7..9f65f93 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,32 +1,31 @@
  "ref\020190430002952.18909-1-tmurphy@arista.com\0"
  "ref\020190430002952.18909-4-tmurphy@arista.com\0"
- "ref\020190430002952.18909-4-tmurphy-nzgTgzXrdUbQT0dZR+AlfA@public.gmane.org\0"
- "From\0Christoph Hellwig <hch-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>\0"
+ "From\0Christoph Hellwig <hch@infradead.org>\0"
  "Subject\0Re: [PATCH v2 3/4] iommu/dma-iommu: Use the dev->coherent_dma_mask\0"
  "Date\0Tue, 30 Apr 2019 04:12:22 -0700\0"
- "To\0Tom Murphy <tmurphy-nzgTgzXrdUbQT0dZR+AlfA@public.gmane.org>\0"
- "Cc\0Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>"
-  Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
-  David Brown <david.brown-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
-  Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
-  linux-s390-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  Krzysztof Kozlowski <krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
-  Jonathan Hunter <jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
-  linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
-  Kukjin Kim <kgene-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
-  Matthias Brugger <matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
-  Gerald Schaefer <gerald.schaefer-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org>
-  Andy Gross <andy.gross-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
-  linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
-  linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
-  David Woodhouse <dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
-  linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  murphyt7-/Zw1syy4LHg@public.gmane.org
-  iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
- " Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>\0"
+ "To\0Tom Murphy <tmurphy@arista.com>\0"
+ "Cc\0Heiko Stuebner <heiko@sntech.de>"
+  Will Deacon <will.deacon@arm.com>
+  David Brown <david.brown@linaro.org>
+  Thierry Reding <thierry.reding@gmail.com>
+  linux-s390@vger.kernel.org
+  linux-samsung-soc@vger.kernel.org
+  Krzysztof Kozlowski <krzk@kernel.org>
+  Jonathan Hunter <jonathanh@nvidia.com>
+  linux-rockchip@lists.infradead.org
+  Kukjin Kim <kgene@kernel.org>
+  Matthias Brugger <matthias.bgg@gmail.com>
+  Gerald Schaefer <gerald.schaefer@de.ibm.com>
+  Andy Gross <andy.gross@linaro.org>
+  linux-arm-msm@vger.kernel.org
+  linux-mediatek@lists.infradead.org
+  linux-tegra@vger.kernel.org
+  linux-arm-kernel@lists.infradead.org
+  David Woodhouse <dwmw2@infradead.org>
+  linux-kernel@vger.kernel.org
+  murphyt7@tcd.ie
+  iommu@lists.linux-foundation.org
+ " Robin Murphy <robin.murphy@arm.com>\0"
  "\00:1\0"
  "b\0"
  ">  static dma_addr_t __iommu_dma_map(struct device *dev, phys_addr_t phys,\n"
@@ -50,8 +49,8 @@
  "it from the DMA mapping fast path entire, something like:\n"
  "\n"
  "---\n"
- ">From 0debafc85174ca830f2e371ff8e8f7465bde3ad8 Mon Sep 17 00:00:00 2001\n"
- "From: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>\n"
+ "From 0debafc85174ca830f2e371ff8e8f7465bde3ad8 Mon Sep 17 00:00:00 2001\n"
+ "From: Christoph Hellwig <hch@lst.de>\n"
  "Date: Tue, 30 Apr 2019 07:06:23 -0400\n"
  "Subject: iommu/dma: opencode __iommu_dma_map in iommu_dma_get_msi_page\n"
  "\n"
@@ -59,7 +58,7 @@
  "mappings and doesn't need to look at the DMA mask.  Just open code\n"
  "it instead of trying to squeeze the behavior into the DMA path helpers.\n"
  "\n"
- "Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>\n"
+ "Signed-off-by: Christoph Hellwig <hch@lst.de>\n"
  "---\n"
  " drivers/iommu/dma-iommu.c | 27 +++++++--------------------\n"
  " 1 file changed, 7 insertions(+), 20 deletions(-)\n"
@@ -139,6 +138,11 @@
  " \tkfree(msi_page);\n"
  " \treturn NULL;\n"
  "-- \n"
- 2.20.1
+ "2.20.1\n"
+ "\n"
+ "_______________________________________________\n"
+ "iommu mailing list\n"
+ "iommu@lists.linux-foundation.org\n"
+ https://lists.linuxfoundation.org/mailman/listinfo/iommu
 
-59822dc48f5ee61c78f2be206a1eb4c6d4d34422497df9afa76d022642e59fba
+593870ad217209fa25ec168db6257e51a43c01a8ae7eb6a091defc1a0390affd
