diff for duplicates of <20200429133712.31431-31-joro@8bytes.org>

diff --git a/a/1.txt b/N1/1.txt
index 1eaa8cf..15e6af4 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,12 +1,12 @@
-From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
+From: Joerg Roedel <jroedel@suse.de>
 
 On Exynos platforms there can be more than one SYSMMU (IOMMU) for one
 DMA master device. Since the IOMMU core code expects only one hardware
 IOMMU, use the first SYSMMU in the list.
 
-Tested-by: Marek Szyprowski <m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
-Acked-by: Marek Szyprowski <m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
-Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
+Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
+Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
+Signed-off-by: Joerg Roedel <jroedel@suse.de>
 ---
  drivers/iommu/exynos-iommu.c | 10 ++++++++++
  1 file changed, 10 insertions(+)
diff --git a/a/content_digest b/N1/content_digest
index 1f2f651..90a0ce5 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,10 +2,7 @@
   "ref\00020200429133712.31431-1-joro\@8bytes.org\0"
 ]
 [
-  "ref\00020200429133712.31431-1-joro-zLv9SwRftAIdnm+yROfE0A\@public.gmane.org\0"
-]
-[
-  "From\0Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A\@public.gmane.org>\0"
+  "From\0Joerg Roedel <joro\@8bytes.org>\0"
 ]
 [
   "Subject\0[PATCH v3 30/34] iommu/exynos: Use first SYSMMU in controllers list for IOMMU core\0"
@@ -14,37 +11,37 @@
   "Date\0Wed, 29 Apr 2020 15:37:08 +0200\0"
 ]
 [
-  "To\0Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A\@public.gmane.org>",
-  " Will Deacon <will-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>",
-  " Robin Murphy <robin.murphy-5wv7dgnIgG8\@public.gmane.org>",
-  " Marek Szyprowski <m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ\@public.gmane.org>",
-  " Kukjin Kim <kgene-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>",
-  " Krzysztof Kozlowski <krzk-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>",
-  " David Woodhouse <dwmw2-wEGCiKHe2LqWVfeAwA7xHQ\@public.gmane.org>",
-  " Lu Baolu <baolu.lu-VuQAYsv1563Yd54FQh9/CA\@public.gmane.org>",
-  " Andy Gross <agross-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>",
-  " Bjorn Andersson <bjorn.andersson-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>",
-  " Matthias Brugger <matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org>",
-  " Rob Clark <robdclark-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org>",
-  " Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ\@public.gmane.org>",
-  " Gerald Schaefer <gerald.schaefer-tA70FqPdS9bQT0dZR+AlfA\@public.gmane.org>",
-  " Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org>",
-  " Jonathan Hunter <jonathanh-DDmLM1+adcrQT0dZR+AlfA\@public.gmane.org>",
-  " Jean-Philippe Brucker <jean-philippe-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>\0"
+  "To\0Joerg Roedel <joro\@8bytes.org>",
+  " Will Deacon <will\@kernel.org>",
+  " Robin Murphy <robin.murphy\@arm.com>",
+  " Marek Szyprowski <m.szyprowski\@samsung.com>",
+  " Kukjin Kim <kgene\@kernel.org>",
+  " Krzysztof Kozlowski <krzk\@kernel.org>",
+  " David Woodhouse <dwmw2\@infradead.org>",
+  " Lu Baolu <baolu.lu\@linux.intel.com>",
+  " Andy Gross <agross\@kernel.org>",
+  " Bjorn Andersson <bjorn.andersson\@linaro.org>",
+  " Matthias Brugger <matthias.bgg\@gmail.com>",
+  " Rob Clark <robdclark\@gmail.com>",
+  " Heiko Stuebner <heiko\@sntech.de>",
+  " Gerald Schaefer <gerald.schaefer\@de.ibm.com>",
+  " Thierry Reding <thierry.reding\@gmail.com>",
+  " Jonathan Hunter <jonathanh\@nvidia.com>",
+  " Jean-Philippe Brucker <jean-philippe\@linaro.org>\0"
 ]
 [
-  "Cc\0Daniel Drake <drake-6IF/jdPJHihWk0Htik3J/w\@public.gmane.org>",
-  " jonathan.derrick-ral2JQCrhuEAvxtiuMwx3w\@public.gmane.org",
-  " iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA\@public.gmane.org",
-  " linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
-  " linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
-  " linux-arm-msm-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
-  " linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
-  " linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
-  " linux-s390-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
-  " linux-tegra-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
-  " virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA\@public.gmane.org",
-  " Joerg Roedel <jroedel-l3A5Bk7waGM\@public.gmane.org>\0"
+  "Cc\0Daniel Drake <drake\@endlessm.com>",
+  " jonathan.derrick\@intel.com",
+  " iommu\@lists.linux-foundation.org",
+  " linux-kernel\@vger.kernel.org",
+  " linux-samsung-soc\@vger.kernel.org",
+  " linux-arm-msm\@vger.kernel.org",
+  " linux-mediatek\@lists.infradead.org",
+  " linux-rockchip\@lists.infradead.org",
+  " linux-s390\@vger.kernel.org",
+  " linux-tegra\@vger.kernel.org",
+  " virtualization\@lists.linux-foundation.org",
+  " Joerg Roedel <jroedel\@suse.de>\0"
 ]
 [
   "\0000:1\0"
@@ -53,15 +50,15 @@
   "b\0"
 ]
 [
-  "From: Joerg Roedel <jroedel-l3A5Bk7waGM\@public.gmane.org>\n",
+  "From: Joerg Roedel <jroedel\@suse.de>\n",
   "\n",
   "On Exynos platforms there can be more than one SYSMMU (IOMMU) for one\n",
   "DMA master device. Since the IOMMU core code expects only one hardware\n",
   "IOMMU, use the first SYSMMU in the list.\n",
   "\n",
-  "Tested-by: Marek Szyprowski <m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ\@public.gmane.org>\n",
-  "Acked-by: Marek Szyprowski <m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ\@public.gmane.org>\n",
-  "Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM\@public.gmane.org>\n",
+  "Tested-by: Marek Szyprowski <m.szyprowski\@samsung.com>\n",
+  "Acked-by: Marek Szyprowski <m.szyprowski\@samsung.com>\n",
+  "Signed-off-by: Joerg Roedel <jroedel\@suse.de>\n",
   "---\n",
   " drivers/iommu/exynos-iommu.c | 10 ++++++++++\n",
   " 1 file changed, 10 insertions(+)\n",
@@ -98,4 +95,4 @@
   "2.17.1"
 ]
 
-a25c3bd558a50bb657cb10250728e0ac5a434ca258c4dffa42f311b6909855e4
+cf32efaad9391eb42d299448038bc475deab2c5abff14337ff21fbbaad006dcb
