diff for duplicates of <152049887716.7289.4774404756657533620.stgit@devbox>

diff --git a/a/1.txt b/N1/1.txt
index 3313fe4..14e98bf 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -3,7 +3,7 @@ bytes of dynamic area and store the string information as
 data_loc format instead of data_rloc.
 This simplifies the fetcharg loop.
 
-Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
+Signed-off-by: Masami Hiramatsu <mhiramat at kernel.org>
 ---
  kernel/trace/trace_kprobe.c     |   51 +++++++++++++++++++-------------------
  kernel/trace/trace_probe.h      |   26 ++++---------------
@@ -407,4 +407,9 @@ index 9fc0123c721f..de4f91bb313a 100644
 +	store_trace_args(ucb->buf, &tu->tp, regs, esize, dsize);
  
  	if (tu->tp.flags & TP_FLAG_TRACE)
- 		uretprobe_trace_func(tu, func, regs, ucb, dsize);
\ No newline at end of file
+ 		uretprobe_trace_func(tu, func, regs, ucb, dsize);
+
+--
+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 b4f8652..e426ea2 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
   "ref\000152049860385.7289.14079393589900496424.stgit\@devbox\0"
 ]
 [
-  "From\0Masami Hiramatsu <mhiramat\@kernel.org>\0"
+  "From\0mhiramat at kernel.org (Masami Hiramatsu)\0"
 ]
 [
   "Subject\0[PATCH v5 10/19] tracing: probeevent: Return consumed bytes of dynamic area\0"
@@ -10,20 +10,6 @@
 [
   "Date\0Thu,  8 Mar 2018 17:47:57 +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\0"
-]
 [
   "\0000:1\0"
 ]
@@ -36,7 +22,7 @@
   "data_loc format instead of data_rloc.\n",
   "This simplifies the fetcharg loop.\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     |   51 +++++++++++++++++++-------------------\n",
   " kernel/trace/trace_probe.h      |   26 ++++---------------\n",
@@ -440,7 +426,12 @@
   "+\tstore_trace_args(ucb->buf, &tu->tp, regs, esize, dsize);\n",
   " \n",
   " \tif (tu->tp.flags & TP_FLAG_TRACE)\n",
-  " \t\turetprobe_trace_func(tu, func, regs, ucb, dsize);"
+  " \t\turetprobe_trace_func(tu, func, regs, ucb, dsize);\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"
 ]
 
-c7727802389884fbdd410a4513c796bc7a16d0ef626f777a274079ec7bdf1647
+4d79421171bb6fe4e6c31ad3191dbb869530d619f5b1adbdabbb1966b5c2b8b0
