diff for duplicates of <1526051730.23162.3.camel@gmx.de>

diff --git a/a/1.txt b/N1/1.txt
index 2181be4..ede0c8e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -42,8 +42,3 @@ Signed-off-by: Mike Galbraith <efault@gmx.de>
 +			0, size, DMA_FROM_DEVICE, attrs);
  	if (phys_addr == SWIOTLB_MAP_ERROR)
  		goto out_warn;
- 
-_______________________________________________
-Nouveau mailing list
-Nouveau@lists.freedesktop.org
-https://lists.freedesktop.org/mailman/listinfo/nouveau
diff --git a/a/content_digest b/N1/content_digest
index fc6b750..1be7c19 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,16 +1,15 @@
  "ref\01525943427.8013.11.camel@gmx.de\0"
  "ref\01525948096.29445.4.camel@gmx.de\0"
  "ref\01526022830.6288.3.camel@gmx.de\0"
- "ref\01526022830.6288.3.camel-Mmb7MZpHnFY@public.gmane.org\0"
- "From\0Mike Galbraith <efault-Mmb7MZpHnFY@public.gmane.org>\0"
+ "From\0Mike Galbraith <efault@gmx.de>\0"
  "Subject\0[patch] swiotlb: fix ignored DMA_ATTR_NO_WARN request\0"
  "Date\0Fri, 11 May 2018 17:15:30 +0200\0"
- "To\0nouveau <nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>\0"
- "Cc\0Christian Koenig <christian.koenig-5C7GfCeVMHo@public.gmane.org>"
-  Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>
-  Roger He <Hongbo.He-5C7GfCeVMHo@public.gmane.org>
-  LKML <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
- " Ben Skeggs <bskeggs-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0"
+ "To\0nouveau <nouveau@lists.freedesktop.org>\0"
+ "Cc\0LKML <linux-kernel@vger.kernel.org>"
+  Ben Skeggs <bskeggs@redhat.com>
+  Christian Koenig <christian.koenig@amd.com>
+  Roger He <Hongbo.He@amd.com>
+ " Christoph Hellwig <hch@lst.de>\0"
  "\00:1\0"
  "b\0"
  "\n"
@@ -56,11 +55,6 @@
  "-\t\t\t0, size, DMA_FROM_DEVICE, 0);\n"
  "+\t\t\t0, size, DMA_FROM_DEVICE, attrs);\n"
  " \tif (phys_addr == SWIOTLB_MAP_ERROR)\n"
- " \t\tgoto out_warn;\n"
- " \n"
- "_______________________________________________\n"
- "Nouveau mailing list\n"
- "Nouveau@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/nouveau
+ " \t\tgoto out_warn;"
 
-bc9d22fb01a7a447df364ecec35e59d6fc0aecb8722e653ce799ff9ba0a6752f
+6d6664c0e6fa042712ea884d21139e5cd4fb925cb738767e9cf6aeb5b67bd444
