diff for duplicates of <154753344814.31541.1870614689774287684.stgit@devbox>

diff --git a/a/1.txt b/N1/1.txt
index 56f2f1e..018a79d 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -39,9 +39,3 @@ index 2a5b338b2542..b2d4b7428ebc 100644
  		return true;
  
  	if (!is_kernel_in_hyp_mode()) {
-
-
-_______________________________________________
-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 44650dd..bd80263 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,12 +4,12 @@
  "Date\0Tue, 15 Jan 2019 15:24:08 +0900\0"
  "To\0Catalin Marinas <catalin.marinas@arm.com>"
  " Will Deacon <will.deacon@arm.com>\0"
- "Cc\0Pratyush Anand <panand@redhat.com>"
-  linux-kernel <linux-kernel@vger.kernel.org>
-  James Morse <james.morse@arm.com>
-  Masami Hiramatsu <mhiramat@kernel.org>
+ "Cc\0Masami Hiramatsu <mhiramat@kernel.org>"
+  Pratyush Anand <panand@redhat.com>
+  David A . Long <dave.long@linaro.org>
   linux-arm-kernel@lists.infradead.org
- " David A . Long <dave.long@linaro.org>\0"
+  linux-kernel <linux-kernel@vger.kernel.org>
+ " James Morse <james.morse@arm.com>\0"
  "\00:1\0"
  "b\0"
  "Move extable address check into arch_prepare_kprobe() from\n"
@@ -52,12 +52,6 @@
  "+\t    addr < (unsigned long)__idmap_text_end))\n"
  " \t\treturn true;\n"
  " \n"
- " \tif (!is_kernel_in_hyp_mode()) {\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
+ " \tif (!is_kernel_in_hyp_mode()) {"
 
-a570d71f0823a1b03aea2e36e52bd6b4161543f563113bb0b3430bbbc3e32600
+8c13c21f2e79d7e2589629f3cddbd0e5a559ea12d494f0b1108be57ebff66f77
