diff for duplicates of <153269396287.3084.11779871423388811593.stgit@devbox>

diff --git a/a/1.txt b/N1/1.txt
index 3cf7760..08de311 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,7 +1,7 @@
 Add trace_printk sample module test. This requires to
 enable trace_printk.ko module for test.
 
-Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
+Signed-off-by: Masami Hiramatsu <mhiramat at kernel.org>
 ---
  .../selftests/ftrace/test.d/event/trace_printk.tc  |   27 ++++++++++++++++++++
  1 file changed, 27 insertions(+)
@@ -39,4 +39,9 @@ index 000000000000..4da4d739f03d
 +grep -q "This is a %s that will use trace_bprintk" printk_formats
 +grep -q "(irq) This is a static string that will use trace_bputs" printk_formats
 +
-+rmmod trace-printk ||:
\ No newline at end of file
++rmmod trace-printk ||:
+
+--
+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 be0ec83..145ba3e 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 20/25] selftests/ftrace: Add trace_printk sample module test\0"
@@ -10,16 +10,6 @@
 [
   "Date\0Fri, 27 Jul 2018 21:19:23 +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 trace_printk sample module test. This requires to\n",
   "enable trace_printk.ko module for test.\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/trace_printk.tc  |   27 ++++++++++++++++++++\n",
   " 1 file changed, 27 insertions(+)\n",
@@ -68,7 +58,12 @@
   "+grep -q \"This is a %s that will use trace_bprintk\" printk_formats\n",
   "+grep -q \"(irq) This is a static string that will use trace_bputs\" printk_formats\n",
   "+\n",
-  "+rmmod trace-printk ||:"
+  "+rmmod trace-printk ||:\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"
 ]
 
-a7c8bcfd82aac81db150f53c6efc09453c20040f4884c889056209cf8bbd84e3
+51e2951aed04e77daee8d5cf69d473415c964a90387f1f3d8be9d85d3617af87
