diff for duplicates of <153269370853.3084.10985190108092225790.stgit@devbox>

diff --git a/a/1.txt b/N1/1.txt
index 6c13884..3cd0adb 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -3,7 +3,7 @@ load/unload with disabled/enabled events. This also change
 the target module to trace_printk.ko, so it depends on
 CONFIG_SAMPLE_TRACE_PRINTK=m.
 
-Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
+Signed-off-by: Masami Hiramatsu <mhiramat at kernel.org>
 ---
  tools/testing/selftests/ftrace/config              |    4 ++
  .../ftrace/test.d/kprobe/kprobe_module.tc          |   35 ++++++++++++++++++--
@@ -72,4 +72,9 @@ index ec6c5fffef1e..1efe9e616bc4 100644
 +:;: "Remove the module again and check the event is not locked"
 +rmmod trace-printk
 +echo 0 > events/kprobes1/event1/enable
-+echo "-:kprobes1/event1" >> kprobe_events
\ No newline at end of file
++echo "-:kprobes1/event1" >> kprobe_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 9cbd544..501cf6e 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 11/25] selftests/ftrace: Improve kprobe on module testcase to load/unload module\0"
@@ -10,16 +10,6 @@
 [
   "Date\0Fri, 27 Jul 2018 21:15:08 +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"
 ]
@@ -32,7 +22,7 @@
   "the target module to trace_printk.ko, so it depends on\n",
   "CONFIG_SAMPLE_TRACE_PRINTK=m.\n",
   "\n",
-  "Signed-off-by: Masami Hiramatsu <mhiramat\@kernel.org>\n",
+  "Signed-off-by: Masami Hiramatsu <mhiramat at kernel.org>\n",
   "---\n",
   " tools/testing/selftests/ftrace/config              |    4 ++\n",
   " .../ftrace/test.d/kprobe/kprobe_module.tc          |   35 ++++++++++++++++++--\n",
@@ -101,7 +91,12 @@
   "+:;: \"Remove the module again and check the event is not locked\"\n",
   "+rmmod trace-printk\n",
   "+echo 0 > events/kprobes1/event1/enable\n",
-  "+echo \"-:kprobes1/event1\" >> kprobe_events"
+  "+echo \"-:kprobes1/event1\" >> kprobe_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"
 ]
 
-e43df27a033186f262a1ed52a06d3271d72f03903fe1a9985640076438378c2b
+0987f8b8624ad0c0b0aec9efa6e627e4ae7aa66554a70213c26424d039d1a6df
