diff for duplicates of <154753353370.31541.14485875717131836689.stgit@devbox>

diff --git a/a/1.txt b/N1/1.txt
index 58cc2a2..5f605de 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -61,3 +61,9 @@ index b9e9758b6534..6c066c34c8a4 100644
  }
  
  void __kprobes __used *trampoline_probe_handler(struct pt_regs *regs)
+
+
+_______________________________________________
+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 df19779..d45b935 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,12 +4,12 @@
  "Date\0Tue, 15 Jan 2019 15:25:33 +0900\0"
  "To\0Catalin Marinas <catalin.marinas@arm.com>"
  " Will Deacon <will.deacon@arm.com>\0"
- "Cc\0Masami Hiramatsu <mhiramat@kernel.org>"
-  Pratyush Anand <panand@redhat.com>
-  David A . Long <dave.long@linaro.org>
-  linux-arm-kernel@lists.infradead.org
+ "Cc\0Pratyush Anand <panand@redhat.com>"
   linux-kernel <linux-kernel@vger.kernel.org>
- " James Morse <james.morse@arm.com>\0"
+  James Morse <james.morse@arm.com>
+  Masami Hiramatsu <mhiramat@kernel.org>
+  linux-arm-kernel@lists.infradead.org
+ " David A . Long <dave.long@linaro.org>\0"
  "\00:1\0"
  "b\0"
  "Use arch_populate_kprobe_blacklist() instead of\n"
@@ -74,6 +74,12 @@
  "+\treturn ret;\n"
  " }\n"
  " \n"
-  void __kprobes __used *trampoline_probe_handler(struct pt_regs *regs)
+ " void __kprobes __used *trampoline_probe_handler(struct pt_regs *regs)\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
 
-10b29d82e4b7b3d6d7c55e7f5f265d5dc73e4bd911e068bbde1bc2905ffdf31c
+3833cb8c6da16feb6219e0dd130e0571d16487c5453bc23eb6bc48a5ad785cb3
