diff for duplicates of <20180415145947.1248-7-hch@lst.de>

diff --git a/a/1.txt b/N1/1.txt
index 9e9fc29..2f05a37 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2,7 +2,7 @@ This way we have one central definition of it, and user can select it as
 needed.  Note that we now also always select it when CONFIG_DMA_API_DEBUG
 is select, which fixes some incorrect checks in a few network drivers.
 
-Signed-off-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>
 ---
  arch/alpha/Kconfig          | 4 +---
  arch/arm/Kconfig            | 4 +---
diff --git a/a/content_digest b/N1/content_digest
index 4ae46fd..54a0949 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,10 @@
   "ref\00020180415145947.1248-1-hch\@lst.de\0"
 ]
 [
-  "From\0Christoph Hellwig <hch\@lst.de>\0"
+  "ref\00020180415145947.1248-1-hch-jcswGhMUV9g\@public.gmane.org\0"
+]
+[
+  "From\0Christoph Hellwig <hch-jcswGhMUV9g\@public.gmane.org>\0"
 ]
 [
   "Subject\0[PATCH 06/12] dma-mapping: move the NEED_DMA_MAP_STATE config symbol to lib/Kconfig\0"
@@ -11,18 +14,18 @@
   "Date\0Sun, 15 Apr 2018 16:59:41 +0200\0"
 ]
 [
-  "To\0Konrad Rzeszutek Wilk <konrad.wilk\@oracle.com>",
-  " iommu\@lists.linux-foundation.org\0"
+  "To\0Konrad Rzeszutek Wilk <konrad.wilk-QHcLZuEGTsvQT0dZR+AlfA\@public.gmane.org>",
+  " iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA\@public.gmane.org\0"
 ]
 [
-  "Cc\0x86\@kernel.org",
-  " linux-block\@vger.kernel.org",
-  " linux-pci\@vger.kernel.org",
-  " linux-mm\@kvack.org",
-  " linux-ide\@vger.kernel.org",
-  " linux-mips\@linux-mips.org",
-  " sparclinux\@vger.kernel.org",
-  " linux-arm-kernel\@lists.infradead.org\0"
+  "Cc\0linux-mips-6z/3iImG2C8G8FEW9MqTrA\@public.gmane.org",
+  " linux-mm-Bw31MaZKKs3YtjvyW6yDsg\@public.gmane.org",
+  " linux-pci-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " x86-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org",
+  " linux-block-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " linux-ide-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " sparclinux-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org\0"
 ]
 [
   "\0000:1\0"
@@ -35,7 +38,7 @@
   "needed.  Note that we now also always select it when CONFIG_DMA_API_DEBUG\n",
   "is select, which fixes some incorrect checks in a few network drivers.\n",
   "\n",
-  "Signed-off-by: Christoph Hellwig <hch\@lst.de>\n",
+  "Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g\@public.gmane.org>\n",
   "---\n",
   " arch/alpha/Kconfig          | 4 +---\n",
   " arch/arm/Kconfig            | 4 +---\n",
@@ -352,4 +355,4 @@
   "2.17.0"
 ]
 
-d028ff8116aa8ff72d0a5a9dbbd64dae2ac2c9a1aa17c11d89157dde8f65827a
+a7c0440430962afa6a18e29e87944bc2d8c18fca943a289a94c16f5c2bf416f7
