diff for duplicates of <153149932412.11274.15289227592627901488.stgit@devbox>

diff --git a/a/1.txt b/N1/1.txt
index 733da26..3e28281 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2,11 +2,11 @@ Add a testcase for checking snapshot and tracing_on
 relationship. This ensures that the snapshotting doesn't
 affect current tracing on/off settings.
 
-Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
-Cc: Steven Rostedt <rostedt@goodmis.org>
-Cc: Ingo Molnar <mingo@redhat.com>
-Cc: Shuah Khan <shuah@kernel.org>
-Cc: linux-kselftest@vger.kernel.org
+Signed-off-by: Masami Hiramatsu <mhiramat at kernel.org>
+Cc: Steven Rostedt <rostedt at goodmis.org>
+Cc: Ingo Molnar <mingo at redhat.com>
+Cc: Shuah Khan <shuah at kernel.org>
+Cc: linux-kselftest at vger.kernel.org
 ---
  .../selftests/ftrace/test.d/00basic/snapshot.tc    |   28 ++++++++++++++++++++
  1 file changed, 28 insertions(+)
@@ -45,4 +45,9 @@ index 000000000000..3b1f45e13a2e
 +echo "Ensure keep tracing on"
 +test `cat tracing_on` -eq 1
 +
-+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 516ff4d..8983dab 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
   "ref\000153149923649.11274.14970833360963898112.stgit\@devbox\0"
 ]
 [
-  "From\0Masami Hiramatsu <mhiramat\@kernel.org>\0"
+  "From\0mhiramat at kernel.org (Masami Hiramatsu)\0"
 ]
 [
   "Subject\0[PATCH 3/3] selftests/ftrace: Add snapshot and tracing_on test case\0"
@@ -10,18 +10,6 @@
 [
   "Date\0Sat, 14 Jul 2018 01:28:44 +0900\0"
 ]
-[
-  "To\0Steven Rostedt <rostedt\@goodmis.org>\0"
-]
-[
-  "Cc\0Ingo Molnar <mingo\@redhat.com>",
-  " Shuah Khan <shuah\@kernel.org>",
-  " Masami Hiramatsu <mhiramat\@kernel.org>",
-  " Tom Zanussi <tom.zanussi\@linux.intel.com>",
-  " Hiraku Toyooka <hiraku.toyooka\@cybertrust.co.jp>",
-  " linux-kernel\@vger.kernel.org",
-  " linux-kselftest\@vger.kernel.org\0"
-]
 [
   "\0000:1\0"
 ]
@@ -33,11 +21,11 @@
   "relationship. This ensures that the snapshotting doesn't\n",
   "affect current tracing on/off settings.\n",
   "\n",
-  "Signed-off-by: Masami Hiramatsu <mhiramat\@kernel.org>\n",
-  "Cc: Steven Rostedt <rostedt\@goodmis.org>\n",
-  "Cc: Ingo Molnar <mingo\@redhat.com>\n",
-  "Cc: Shuah Khan <shuah\@kernel.org>\n",
-  "Cc: linux-kselftest\@vger.kernel.org\n",
+  "Signed-off-by: Masami Hiramatsu <mhiramat at kernel.org>\n",
+  "Cc: Steven Rostedt <rostedt at goodmis.org>\n",
+  "Cc: Ingo Molnar <mingo at redhat.com>\n",
+  "Cc: Shuah Khan <shuah at kernel.org>\n",
+  "Cc: linux-kselftest at vger.kernel.org\n",
   "---\n",
   " .../selftests/ftrace/test.d/00basic/snapshot.tc    |   28 ++++++++++++++++++++\n",
   " 1 file changed, 28 insertions(+)\n",
@@ -76,7 +64,12 @@
   "+echo \"Ensure keep tracing on\"\n",
   "+test `cat tracing_on` -eq 1\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"
 ]
 
-d5e14788dc1da80b647a95c41608accb488d212100ea3aa18ba4accf6f3718be
+e16734f20c5dad5cd40da41264acfb187c0350f9f9a14f71c4680565bc8992b9
