diff for duplicates of <152049902203.7289.16190148398873525191.stgit@devbox>

diff --git a/a/1.txt b/N1/1.txt
index c43fc12..a64f8e9 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -6,7 +6,7 @@ Note that this returns most probably assignment of registers
 and stacks. In some case, it may not work well. If you need
 to access correct registers or stacks you should use perf-probe.
 
-Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
+Signed-off-by: Masami Hiramatsu <mhiramat at kernel.org>
 ---
  Changes in v2:
   - Add $argN in README file
@@ -283,4 +283,9 @@ index 64c1fbe087a1..e15da2281855 100644
 +					is_return ? TPARG_FL_RETURN : 0);
  		if (ret) {
  			pr_info("Parse error at argument[%d]. (%d)\n", i, ret);
- 			goto error;
\ No newline at end of file
+ 			goto error;
+
+--
+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 f21c8f1..1c27689 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
   "ref\000152049860385.7289.14079393589900496424.stgit\@devbox\0"
 ]
 [
-  "From\0Masami Hiramatsu <mhiramat\@kernel.org>\0"
+  "From\0mhiramat at kernel.org (Masami Hiramatsu)\0"
 ]
 [
   "Subject\0[PATCH v5 15/19] tracing: probeevent: Add \$argN for accessing function args\0"
@@ -10,20 +10,6 @@
 [
   "Date\0Thu,  8 Mar 2018 17:50:22 +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\0"
-]
 [
   "\0000:1\0"
 ]
@@ -39,7 +25,7 @@
   "and stacks. In some case, it may not work well. If you need\n",
   "to access correct registers or stacks you should use perf-probe.\n",
   "\n",
-  "Signed-off-by: Masami Hiramatsu <mhiramat\@kernel.org>\n",
+  "Signed-off-by: Masami Hiramatsu <mhiramat at kernel.org>\n",
   "---\n",
   " Changes in v2:\n",
   "  - Add \$argN in README file\n",
@@ -316,7 +302,12 @@
   "+\t\t\t\t\tis_return ? TPARG_FL_RETURN : 0);\n",
   " \t\tif (ret) {\n",
   " \t\t\tpr_info(\"Parse error at argument[%d]. (%d)\\n\", i, ret);\n",
-  " \t\t\tgoto error;"
+  " \t\t\tgoto error;\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"
 ]
 
-52466e3e48ef5e1dcdeedac8ac87a08d1ef276523f811c7c8bcae534195707a8
+7539ec622e13497c7e2233d6c893133ed36ee1b373a86a8ea80312afba51d3da
