diff for duplicates of <153269359538.3084.13319633364346007624.stgit@devbox>

diff --git a/a/1.txt b/N1/1.txt
index ff9d1dc..7461aa3 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -4,7 +4,7 @@ ftrace for each test case.
 Just remove such unneeded init/cleanup code because it can
 increase logfile size.
 
-Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
+Signed-off-by: Masami Hiramatsu <mhiramat at kernel.org>
 ---
  .../selftests/ftrace/test.d/event/event-enable.tc  |    6 ------
  .../selftests/ftrace/test.d/event/event-pid.tc     |    3 +--
@@ -414,7 +414,7 @@ index 2a1755bfc290..37443dd23d15 100644
 -echo > kprobe_events
 -enable_tracing
 -
- echo 'p:testprobe _do_fork $stack0:s32 $stack0:u32 $stack0:x32 $stack0:b8@4/32' > kprobe_events
+ echo 'p:testprobe _do_fork $stack0:s32 $stack0:u32 $stack0:x32 $stack0:b8 at 4/32' > kprobe_events
  grep testprobe kprobe_events
  test -d events/kprobes/testprobe
 diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc
@@ -1279,4 +1279,9 @@ index c59d9eb546da..d5d2dcbc9cab 100644
  
 -do_reset
 -
- exit 0
\ No newline at end of file
+ exit 0
+
+--
+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 478b9bc..bd22de0 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 07/25] selftests/ftrace: Remove unneeded per-test init/cleanup ftrace\0"
@@ -10,16 +10,6 @@
 [
   "Date\0Fri, 27 Jul 2018 21:13:15 +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"
 ]
@@ -33,7 +23,7 @@
   "Just remove such unneeded init/cleanup code because it can\n",
   "increase logfile size.\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/event/event-enable.tc  |    6 ------\n",
   " .../selftests/ftrace/test.d/event/event-pid.tc     |    3 +--\n",
@@ -443,7 +433,7 @@
   "-echo > kprobe_events\n",
   "-enable_tracing\n",
   "-\n",
-  " echo 'p:testprobe _do_fork \$stack0:s32 \$stack0:u32 \$stack0:x32 \$stack0:b8\@4/32' > kprobe_events\n",
+  " echo 'p:testprobe _do_fork \$stack0:s32 \$stack0:u32 \$stack0:x32 \$stack0:b8 at 4/32' > kprobe_events\n",
   " grep testprobe kprobe_events\n",
   " test -d events/kprobes/testprobe\n",
   "diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc\n",
@@ -1308,7 +1298,12 @@
   " \n",
   "-do_reset\n",
   "-\n",
-  " exit 0"
+  " exit 0\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"
 ]
 
-0536378bef396b1bd8d0237f9d77a7533409ab15cea9b686991e71b5d0c34be0
+8f2dd11e8133089e1550927522ebb59681eea4fc88d3e530ee4c0741c037c076
