diff for duplicates of <20181205183303.828422192@goodmis.org>

diff --git a/a/1.txt b/N1/1.txt
index 85acf48..8b3619d 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -107,10 +107,3 @@ index 77734451cb05..74fdcacba514 100644
  		function_trace_op = set_function_trace_op;
 -- 
 2.19.1
-
-
-
-_______________________________________________
-linux-arm-kernel mailing list
-linux-arm-kernel@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index 18e4df0..e58bd21 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,13 +3,13 @@
  "Subject\0[PATCH 1/2] ftrace: Allow ftrace_replace_code() to be schedulable\0"
  "Date\0Wed, 05 Dec 2018 12:48:53 -0500\0"
  "To\0linux-kernel@vger.kernel.org\0"
- "Cc\0Anders Roxell <anders.roxell@linaro.org>"
+ "Cc\0catalin.marinas@arm.com"
+  will.deacon@arm.com
   keescook@chromium.org
   arnd@arndb.de
-  catalin.marinas@arm.com
-  will.deacon@arm.com
-  Ingo Molnar <mingo@kernel.org>
- " linux-arm-kernel@lists.infradead.org\0"
+  linux-arm-kernel@lists.infradead.org
+  Anders Roxell <anders.roxell@linaro.org>
+ " Ingo Molnar <mingo@kernel.org>\0"
  "\00:1\0"
  "b\0"
  "From: \"Steven Rostedt (VMware)\" <rostedt@goodmis.org>\n"
@@ -120,13 +120,6 @@
  " \tif (update && ftrace_trace_function != ftrace_ops_list_func) {\n"
  " \t\tfunction_trace_op = set_function_trace_op;\n"
  "-- \n"
- "2.19.1\n"
- "\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "linux-arm-kernel mailing list\n"
- "linux-arm-kernel@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+ 2.19.1
 
-5b6b1608a950469c1d46ee3e2dc585220ed45b41ba33b08b04f79ef3c79ec4b8
+7cbdd75637ff7d80a3fd6b82ff2620f9a19d087fb99b2911c116c7071ad062dc
