diff for duplicates of <153269373686.3084.7147052615547188965.stgit@devbox>

diff --git a/a/1.txt b/N1/1.txt
index 038d897..af5025f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2,7 +2,7 @@ Improve kprobe testcase to check the log data correctness
 and ensure the event definition is corrctly including
 argument definition.
 
-Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
+Signed-off-by: Masami Hiramatsu <mhiramat at kernel.org>
 ---
  .../selftests/ftrace/test.d/kprobe/kprobe_args.tc  |    6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
@@ -26,4 +26,9 @@ index 9578535ccd67..bcdecf80a8f1 100644
 +
  echo 0 > events/kprobes/testprobe/enable
  echo "-:testprobe" >> kprobe_events
- clear_trace
\ No newline at end of file
+ clear_trace
+
+--
+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 94280a3..3a71474 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
   "ref\000153269339575.3084.16279591141931053689.stgit\@devbox\0"
 ]
 [
-  "From\0Masami Hiramatsu <mhiramat\@kernel.org>\0"
+  "From\0mhiramat at kernel.org (Masami Hiramatsu)\0"
 ]
 [
   "Subject\0[PATCH 12/25] selftests/ftrace: Improve kprobe testcase to check log data\0"
@@ -10,16 +10,6 @@
 [
   "Date\0Fri, 27 Jul 2018 21:15:37 +0900\0"
 ]
-[
-  "To\0Shuah Khan <shuah\@kernel.org>",
-  " Steven Rostedt <rostedt\@goodmis.org>\0"
-]
-[
-  "Cc\0Ingo Molnar <mingo\@redhat.com>",
-  " Masami Hiramatsu <mhiramat\@kernel.org>",
-  " linux-kselftest\@vger.kernel.org",
-  " linux-kernel\@vger.kernel.org\0"
-]
 [
   "\0000:1\0"
 ]
@@ -31,7 +21,7 @@
   "and ensure the event definition is corrctly including\n",
   "argument definition.\n",
   "\n",
-  "Signed-off-by: Masami Hiramatsu <mhiramat\@kernel.org>\n",
+  "Signed-off-by: Masami Hiramatsu <mhiramat at kernel.org>\n",
   "---\n",
   " .../selftests/ftrace/test.d/kprobe/kprobe_args.tc  |    6 +++++-\n",
   " 1 file changed, 5 insertions(+), 1 deletion(-)\n",
@@ -55,7 +45,12 @@
   "+\n",
   " echo 0 > events/kprobes/testprobe/enable\n",
   " echo \"-:testprobe\" >> kprobe_events\n",
-  " clear_trace"
+  " clear_trace\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"
 ]
 
-86247fc1aa9f4ee919668a5389399f6004470c4cc31ee22ea6b0871a699125e8
+1a2bd3232623f5531fa656b2094d7f4c633ba14a57bbf51b802618051b51c058
