diff for duplicates of <152129051562.31874.14164494878447631336.stgit@devbox>

diff --git a/a/1.txt b/N1/1.txt
index 2b44585..ec54102 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,7 +1,7 @@
 Cleanup event argument definition code in one place for
 maintenancability.
 
-Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
+Signed-off-by: Masami Hiramatsu <mhiramat at kernel.org>
 ---
  kernel/trace/trace_kprobe.c |   32 ++++----------------------------
  kernel/trace/trace_probe.c  |   21 +++++++++++++++++++++
@@ -139,4 +139,9 @@ index 4c006a693663..887da2bb63aa 100644
 +	return traceprobe_define_arg_fields(event_call, size, &tu->tp);
  }
  
- #ifdef CONFIG_PERF_EVENTS
\ No newline at end of file
+ #ifdef CONFIG_PERF_EVENTS
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 236a805..68fc40a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
   "ref\000152129024033.31874.15800253385376959274.stgit\@devbox\0"
 ]
 [
-  "From\0Masami Hiramatsu <mhiramat\@kernel.org>\0"
+  "From\0mhiramat at kernel.org (Masami Hiramatsu)\0"
 ]
 [
   "Subject\0[PATCH v6 06/21] tracing: probeevent: Cleanup argument field definition\0"
@@ -10,21 +10,6 @@
 [
   "Date\0Sat, 17 Mar 2018 21:41:55 +0900\0"
 ]
-[
-  "To\0Steven Rostedt <rostedt\@goodmis.org>",
-  " linux-kernel\@vger.kernel.org\0"
-]
-[
-  "Cc\0mhiramat\@kernel.org",
-  " Ingo Molnar <mingo\@redhat.com>",
-  " Namhyung Kim <namhyung\@kernel.org>",
-  " Tom Zanussi <tom.zanussi\@linux.intel.com>",
-  " Arnaldo Carvalho de Melo <acme\@kernel.org>",
-  " linux-trace-users\@vger.kernel.org",
-  " linux-kselftest\@vger.kernel.org",
-  " shuah\@kernel.org",
-  " Ravi Bangoria <ravi.bangoria\@linux.vnet.ibm.com>\0"
-]
 [
   "\0000:1\0"
 ]
@@ -35,7 +20,7 @@
   "Cleanup event argument definition code in one place for\n",
   "maintenancability.\n",
   "\n",
-  "Signed-off-by: Masami Hiramatsu <mhiramat\@kernel.org>\n",
+  "Signed-off-by: Masami Hiramatsu <mhiramat at kernel.org>\n",
   "---\n",
   " kernel/trace/trace_kprobe.c |   32 ++++----------------------------\n",
   " kernel/trace/trace_probe.c  |   21 +++++++++++++++++++++\n",
@@ -173,7 +158,12 @@
   "+\treturn traceprobe_define_arg_fields(event_call, size, &tu->tp);\n",
   " }\n",
   " \n",
-  " #ifdef CONFIG_PERF_EVENTS"
+  " #ifdef CONFIG_PERF_EVENTS\n",
+  "\n",
+  "--\n",
+  "To unsubscribe from this list: send the line \"unsubscribe linux-kselftest\" in\n",
+  "the body of a message to majordomo at vger.kernel.org\n",
+  "More majordomo info at  http://vger.kernel.org/majordomo-info.html"
 ]
 
-6ceba0caf394ce71715eeac75a3c78d8220e61a2d787564e5fa313ce8ee2d687
+a22c78a72a3c90ea5f261d62630953c9b2c3ab26a532ebbe035a8fb203adc6fe
