diff for duplicates of <20190421011719.14909-7-baolu.lu@linux.intel.com>

diff --git a/a/1.txt b/N1/1.txt
index c611af5..bccb6ae 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -3,11 +3,11 @@ also declares some events which could be used to trace
 the events when an IOVA is being mapped or unmapped in
 a domain.
 
-Cc: Ashok Raj <ashok.raj-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
-Cc: Jacob Pan <jacob.jun.pan-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
-Cc: Kevin Tian <kevin.tian-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
-Signed-off-by: Mika Westerberg <mika.westerberg-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
-Signed-off-by: Lu Baolu <baolu.lu-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
+Cc: Ashok Raj <ashok.raj@intel.com>
+Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
+Cc: Kevin Tian <kevin.tian@intel.com>
+Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
+Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
 ---
  drivers/iommu/Makefile             |   1 +
  drivers/iommu/intel-trace.c        |  14 +++
@@ -40,7 +40,7 @@ index 000000000000..bfb6a6e37a88
 + *
 + * Copyright (C) 2019 Intel Corporation
 + *
-+ * Author: Lu Baolu <baolu.lu-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
++ * Author: Lu Baolu <baolu.lu@linux.intel.com>
 + */
 +
 +#include <linux/string.h>
@@ -60,7 +60,7 @@ index 000000000000..49ca57a90079
 + *
 + * Copyright (C) 2019 Intel Corporation
 + *
-+ * Author: Lu Baolu <baolu.lu-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
++ * Author: Lu Baolu <baolu.lu@linux.intel.com>
 + */
 +#undef TRACE_SYSTEM
 +#define TRACE_SYSTEM intel_iommu
@@ -188,3 +188,8 @@ index 000000000000..49ca57a90079
 +#include <trace/define_trace.h>
 -- 
 2.17.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 3bced48..91bdb19 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,21 +1,20 @@
  "ref\020190421011719.14909-1-baolu.lu@linux.intel.com\0"
- "ref\020190421011719.14909-1-baolu.lu-VuQAYsv1563Yd54FQh9/CA@public.gmane.org\0"
- "From\0Lu Baolu <baolu.lu-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>\0"
+ "From\0Lu Baolu <baolu.lu@linux.intel.com>\0"
  "Subject\0[PATCH v3 06/10] iommu/vt-d: Add trace events for domain map/unmap\0"
  "Date\0Sun, 21 Apr 2019 09:17:15 +0800\0"
- "To\0David Woodhouse <dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>"
- " Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>\0"
- "Cc\0kevin.tian-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org"
-  ashok.raj-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org
-  Konrad Rzeszutek Wilk <konrad.wilk-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
-  alan.cox-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org
-  Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>
-  iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
-  linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  pengfei.xu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org
-  jacob.jun.pan-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org
-  mika.westerberg-VuQAYsv1563Yd54FQh9/CA@public.gmane.org
- " Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>\0"
+ "To\0David Woodhouse <dwmw2@infradead.org>"
+ " Joerg Roedel <joro@8bytes.org>\0"
+ "Cc\0kevin.tian@intel.com"
+  ashok.raj@intel.com
+  Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+  alan.cox@intel.com
+  Robin Murphy <robin.murphy@arm.com>
+  iommu@lists.linux-foundation.org
+  linux-kernel@vger.kernel.org
+  pengfei.xu@intel.com
+  jacob.jun.pan@intel.com
+  mika.westerberg@linux.intel.com
+ " Christoph Hellwig <hch@lst.de>\0"
  "\00:1\0"
  "b\0"
  "This adds trace support for the Intel IOMMU driver. It\n"
@@ -23,11 +22,11 @@
  "the events when an IOVA is being mapped or unmapped in\n"
  "a domain.\n"
  "\n"
- "Cc: Ashok Raj <ashok.raj-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>\n"
- "Cc: Jacob Pan <jacob.jun.pan-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>\n"
- "Cc: Kevin Tian <kevin.tian-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>\n"
- "Signed-off-by: Mika Westerberg <mika.westerberg-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>\n"
- "Signed-off-by: Lu Baolu <baolu.lu-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>\n"
+ "Cc: Ashok Raj <ashok.raj@intel.com>\n"
+ "Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>\n"
+ "Cc: Kevin Tian <kevin.tian@intel.com>\n"
+ "Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>\n"
+ "Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>\n"
  "---\n"
  " drivers/iommu/Makefile             |   1 +\n"
  " drivers/iommu/intel-trace.c        |  14 +++\n"
@@ -60,7 +59,7 @@
  "+ *\n"
  "+ * Copyright (C) 2019 Intel Corporation\n"
  "+ *\n"
- "+ * Author: Lu Baolu <baolu.lu-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>\n"
+ "+ * Author: Lu Baolu <baolu.lu@linux.intel.com>\n"
  "+ */\n"
  "+\n"
  "+#include <linux/string.h>\n"
@@ -80,7 +79,7 @@
  "+ *\n"
  "+ * Copyright (C) 2019 Intel Corporation\n"
  "+ *\n"
- "+ * Author: Lu Baolu <baolu.lu-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>\n"
+ "+ * Author: Lu Baolu <baolu.lu@linux.intel.com>\n"
  "+ */\n"
  "+#undef TRACE_SYSTEM\n"
  "+#define TRACE_SYSTEM intel_iommu\n"
@@ -207,6 +206,11 @@
  "+/* This part must be outside protection */\n"
  "+#include <trace/define_trace.h>\n"
  "-- \n"
- 2.17.1
+ "2.17.1\n"
+ "\n"
+ "_______________________________________________\n"
+ "iommu mailing list\n"
+ "iommu@lists.linux-foundation.org\n"
+ https://lists.linuxfoundation.org/mailman/listinfo/iommu
 
-1c30e92613a0e68b11f21d61abd992d80a2419010798a86cc98fffffa71533be
+b853518f0fb9ef599a919a78fe0ece780694a10e84c95eb6f21364b1bae42b9d
