diff for duplicates of <153269379362.3084.6493537345417100466.stgit@devbox>

diff --git a/a/1.txt b/N1/1.txt
index f2dfa03..fb868fb 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -4,7 +4,7 @@ kprobe-event argument can be recorded in given types with
 various bitsize (8, 16, 32, 64), thus the type testcase
 should test the different bitsize too.
 
-Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
+Signed-off-by: Masami Hiramatsu <mhiramat at kernel.org>
 ---
  .../ftrace/test.d/kprobe/kprobe_args_type.tc       |   48 +++++++++++++-------
  1 file changed, 32 insertions(+), 16 deletions(-)
@@ -17,7 +17,7 @@ index 37443dd23d15..1bcb67dcae26 100644
  
  grep "x8/16/32/64" README > /dev/null || exit_unsupported # version issue
  
--echo 'p:testprobe _do_fork $stack0:s32 $stack0:u32 $stack0:x32 $stack0:b8@4/32' > kprobe_events
+-echo 'p:testprobe _do_fork $stack0:s32 $stack0:u32 $stack0:x32 $stack0:b8 at 4/32' > kprobe_events
 -grep testprobe kprobe_events
 -test -d events/kprobes/testprobe
 -
@@ -26,7 +26,7 @@ index 37443dd23d15..1bcb67dcae26 100644
 -echo 0 > events/kprobes/testprobe/enable
 -ARGS=`tail -n 1 trace | sed -e 's/.* arg1=\(.*\) arg2=\(.*\) arg3=\(.*\) arg4=\(.*\)/\1 \2 \3 \4/'`
 +gen_event() { # Bitsize
-+  echo "p:testprobe _do_fork \$stack0:s$1 \$stack0:u$1 \$stack0:x$1 \$stack0:b4@4/$1"
++  echo "p:testprobe _do_fork \$stack0:s$1 \$stack0:u$1 \$stack0:x$1 \$stack0:b4 at 4/$1"
 +}
  
 -check_types() {
@@ -74,4 +74,9 @@ index 37443dd23d15..1bcb67dcae26 100644
 +
 +done
 +
-+exit_pass
\ No newline at end of file
++exit_pass
+
+--
+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 27e56a6..c9860b4 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 14/25] selftests/ftrace: Test kprobe-event argument with various bitsize\0"
@@ -10,16 +10,6 @@
 [
   "Date\0Fri, 27 Jul 2018 21:16:33 +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"
 ]
@@ -33,7 +23,7 @@
   "various bitsize (8, 16, 32, 64), thus the type testcase\n",
   "should test the different bitsize too.\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/kprobe/kprobe_args_type.tc       |   48 +++++++++++++-------\n",
   " 1 file changed, 32 insertions(+), 16 deletions(-)\n",
@@ -46,7 +36,7 @@
   " \n",
   " grep \"x8/16/32/64\" README > /dev/null || exit_unsupported # version issue\n",
   " \n",
-  "-echo 'p:testprobe _do_fork \$stack0:s32 \$stack0:u32 \$stack0:x32 \$stack0:b8\@4/32' > kprobe_events\n",
+  "-echo 'p:testprobe _do_fork \$stack0:s32 \$stack0:u32 \$stack0:x32 \$stack0:b8 at 4/32' > kprobe_events\n",
   "-grep testprobe kprobe_events\n",
   "-test -d events/kprobes/testprobe\n",
   "-\n",
@@ -55,7 +45,7 @@
   "-echo 0 > events/kprobes/testprobe/enable\n",
   "-ARGS=`tail -n 1 trace | sed -e 's/.* arg1=\\(.*\\) arg2=\\(.*\\) arg3=\\(.*\\) arg4=\\(.*\\)/\\1 \\2 \\3 \\4/'`\n",
   "+gen_event() { # Bitsize\n",
-  "+  echo \"p:testprobe _do_fork \\\$stack0:s\$1 \\\$stack0:u\$1 \\\$stack0:x\$1 \\\$stack0:b4\@4/\$1\"\n",
+  "+  echo \"p:testprobe _do_fork \\\$stack0:s\$1 \\\$stack0:u\$1 \\\$stack0:x\$1 \\\$stack0:b4 at 4/\$1\"\n",
   "+}\n",
   " \n",
   "-check_types() {\n",
@@ -103,7 +93,12 @@
   "+\n",
   "+done\n",
   "+\n",
-  "+exit_pass"
+  "+exit_pass\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"
 ]
 
-965cd9b065f3eca97e20f883ccaeba171772c494916b85bfe39bce9ec0e5ab4b
+83156d50a1937d947b2de3a376f39db87d5f6d099c0eb2152412b8173ed5e527
