diff for duplicates of <153269404756.3084.16183774834747280299.stgit@devbox>

diff --git a/a/1.txt b/N1/1.txt
index 2b817ef..f6179e1 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,7 +1,7 @@
 Add a testcase for max stack tracer, which checks basic
 max stack usage tracing and its filter feature.
 
-Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
+Signed-off-by: Masami Hiramatsu <mhiramat at kernel.org>
 ---
  .../ftrace/test.d/ftrace/func_stack_tracer.tc      |   39 ++++++++++++++++++++
  1 file changed, 39 insertions(+)
@@ -51,4 +51,9 @@ index 000000000000..b414f0e3c646
 +  echo $FL | grep -q "lock"
 +  timeout=$((timeout - 1))
 +done
-+echo 0 > /proc/sys/kernel/stack_tracer_enabled
\ No newline at end of file
++echo 0 > /proc/sys/kernel/stack_tracer_enabled
+
+--
+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 63487e9..df395e8 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 23/25] selftests/ftrace: Add max stack tracer testcase\0"
@@ -10,16 +10,6 @@
 [
   "Date\0Fri, 27 Jul 2018 21:20:47 +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"
 ]
@@ -30,7 +20,7 @@
   "Add a testcase for max stack tracer, which checks basic\n",
   "max stack usage tracing and its filter feature.\n",
   "\n",
-  "Signed-off-by: Masami Hiramatsu <mhiramat\@kernel.org>\n",
+  "Signed-off-by: Masami Hiramatsu <mhiramat at kernel.org>\n",
   "---\n",
   " .../ftrace/test.d/ftrace/func_stack_tracer.tc      |   39 ++++++++++++++++++++\n",
   " 1 file changed, 39 insertions(+)\n",
@@ -80,7 +70,12 @@
   "+  echo \$FL | grep -q \"lock\"\n",
   "+  timeout=\$((timeout - 1))\n",
   "+done\n",
-  "+echo 0 > /proc/sys/kernel/stack_tracer_enabled"
+  "+echo 0 > /proc/sys/kernel/stack_tracer_enabled\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"
 ]
 
-fd8f3c4a4025893abeed280956942edc2600cb28f0f4e02006d752574595e21f
+d76839f204feb3729bf92b19974ae032b791610772d68c27a8dd6f0b41f0b4ba
