diff for duplicates of <152129109566.31874.6546174329596347746.stgit@devbox>

diff --git a/a/1.txt b/N1/1.txt
index 09eb471..5e1ca9f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -4,7 +4,7 @@ the traced data is correct in several way.
 If the kernel doesn't support array type, it skips
 the test as UNSUPPORTED.
 
-Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
+Signed-off-by: Masami Hiramatsu <mhiramat at kernel.org>
 ---
  Changes in v4:
   - Add format field tests.
@@ -76,7 +76,7 @@ index 000000000000..0d0450b858fc
 +create_testprobe "+0(${ARG2}):x64[1] +0(${ARG2}):symbol[1]"
 +check_field "field:u64 arg1\[1\];.*size:8;"
 +check_field "field:u${BITS} arg2\[1\];.*size:${OFFS};"
-+create_testprobe "+0(${ARG2}):b2@3/8[1] +0(${ARG2}):string[1]"
++create_testprobe "+0(${ARG2}):b2 at 3/8[1] +0(${ARG2}):string[1]"
 +check_field "field:u8 arg1\[1\];.*size:1;"
 +check_field "field:__data_loc char\[\]\[1\] arg2;.*size:4;"
 +create_testprobe "+0(${ARG2}):x8[64] @${GOODSYM}:x8[4]"
@@ -110,4 +110,9 @@ index 000000000000..0d0450b858fc
 +tail -n 1 trace | grep -qe "testprobe.* arg1={49,50,51,52}" # ascii code
 +echo 0 > events/kprobes/testprobe/enable
 +
-+echo > kprobe_events
\ No newline at end of file
++echo > 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 f4c5b28..dd72354 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
   "ref\000152129024033.31874.15800253385376959274.stgit\@devbox\0"
 ]
 [
-  "From\0Masami Hiramatsu <mhiramat\@kernel.org>\0"
+  "From\0mhiramat at kernel.org (Masami Hiramatsu)\0"
 ]
 [
   "Subject\0[PATCH v6 19/21] selftests: ftrace: Add a testcase for array type with kprobe_event\0"
@@ -10,21 +10,6 @@
 [
   "Date\0Sat, 17 Mar 2018 21:51:35 +0900\0"
 ]
-[
-  "To\0Steven Rostedt <rostedt\@goodmis.org>",
-  " linux-kernel\@vger.kernel.org\0"
-]
-[
-  "Cc\0mhiramat\@kernel.org",
-  " Ingo Molnar <mingo\@redhat.com>",
-  " Namhyung Kim <namhyung\@kernel.org>",
-  " Tom Zanussi <tom.zanussi\@linux.intel.com>",
-  " Arnaldo Carvalho de Melo <acme\@kernel.org>",
-  " linux-trace-users\@vger.kernel.org",
-  " linux-kselftest\@vger.kernel.org",
-  " shuah\@kernel.org",
-  " Ravi Bangoria <ravi.bangoria\@linux.vnet.ibm.com>\0"
-]
 [
   "\0000:1\0"
 ]
@@ -38,7 +23,7 @@
   "If the kernel doesn't support array type, it skips\n",
   "the test as UNSUPPORTED.\n",
   "\n",
-  "Signed-off-by: Masami Hiramatsu <mhiramat\@kernel.org>\n",
+  "Signed-off-by: Masami Hiramatsu <mhiramat at kernel.org>\n",
   "---\n",
   " Changes in v4:\n",
   "  - Add format field tests.\n",
@@ -110,7 +95,7 @@
   "+create_testprobe \"+0(\${ARG2}):x64[1] +0(\${ARG2}):symbol[1]\"\n",
   "+check_field \"field:u64 arg1\\[1\\];.*size:8;\"\n",
   "+check_field \"field:u\${BITS} arg2\\[1\\];.*size:\${OFFS};\"\n",
-  "+create_testprobe \"+0(\${ARG2}):b2\@3/8[1] +0(\${ARG2}):string[1]\"\n",
+  "+create_testprobe \"+0(\${ARG2}):b2 at 3/8[1] +0(\${ARG2}):string[1]\"\n",
   "+check_field \"field:u8 arg1\\[1\\];.*size:1;\"\n",
   "+check_field \"field:__data_loc char\\[\\]\\[1\\] arg2;.*size:4;\"\n",
   "+create_testprobe \"+0(\${ARG2}):x8[64] \@\${GOODSYM}:x8[4]\"\n",
@@ -144,7 +129,12 @@
   "+tail -n 1 trace | grep -qe \"testprobe.* arg1={49,50,51,52}\" # ascii code\n",
   "+echo 0 > events/kprobes/testprobe/enable\n",
   "+\n",
-  "+echo > kprobe_events"
+  "+echo > 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"
 ]
 
-45020ef54eaf86c029fee69f8213f40bd0e5567edeffeb56930ad75695e28a79
+0a63aebed1e8f815da63f83f1607894f8d34f55e36d7112615444e1dc0392121
