diff for duplicates of <156404255444.2020.3301023170351823334.stgit@devnote2>

diff --git a/a/1.txt b/N1/1.txt
index 0abfa45..0d400e6 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -123,9 +123,3 @@ index bd5dfffca272..bf2259651b67 100644
  		/* IRQs and single stepping do not mix well. */
  		kprobes_save_local_irqflag(kcb, regs);
  		kernel_enable_single_step(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 2800a26..401abac 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,15 +4,15 @@
  "Date\0Thu, 25 Jul 2019 17:15:54 +0900\0"
  "To\0Catalin Marinas <catalin.marinas@arm.com>"
  " Will Deacon <will.deacon@arm.com>\0"
- "Cc\0Dan Rue <dan.rue@linaro.org>"
-  Daniel Diaz <daniel.diaz@linaro.org>
-  Anders Roxell <anders.roxell@linaro.org>
-  Naresh Kamboju <naresh.kamboju@linaro.org>
+ "Cc\0mhiramat@kernel.org"
+  linux-arm-kernel@lists.infradead.org
   linux-kernel@vger.kernel.org
-  James Morse <james.morse@arm.com>
+  Naresh Kamboju <naresh.kamboju@linaro.org>
+  Dan Rue <dan.rue@linaro.org>
   Matt Hart <matthew.hart@linaro.org>
-  linux-arm-kernel@lists.infradead.org
- " mhiramat@kernel.org\0"
+  Anders Roxell <anders.roxell@linaro.org>
+  Daniel Diaz <daniel.diaz@linaro.org>
+ " James Morse <james.morse@arm.com>\0"
  "\00:1\0"
  "b\0"
  "kprobes manipulates the interrupted PSTATE for single step, and\n"
@@ -139,12 +139,6 @@
  "-\n"
  " \t\t/* IRQs and single stepping do not mix well. */\n"
  " \t\tkprobes_save_local_irqflag(kcb, regs);\n"
- " \t\tkernel_enable_single_step(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
+ " \t\tkernel_enable_single_step(regs);"
 
-f82885b8be06d09f8651e21d1a16c975af0830509addade4efb116d0c7f32f1a
+98c58ae0f34caf46aa1d7765a97a22df0eff3b46654a4f49af10d45e45112aab
