diff for duplicates of <154998625948.21869.8505204111913908807.stgit@devbox>

diff --git a/a/1.txt b/N1/1.txt
index 398721a..7de4563 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -33,9 +33,3 @@ index bd06b4b13fa9..194262fca5cd 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 48220a4..67e6c20 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,12 +4,12 @@
  "Date\0Wed, 13 Feb 2019 00:44:19 +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 exception/irqentry text address check in blacklist,\n"
@@ -46,12 +46,6 @@
  "+\t    in_exception_text(addr))\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()) {"
 
-f4e9abf92ecfd7c7836b00d2da3afebb085b00256baa148a76e1a5567e59aae9
+c6261568119e427fb985244cedf4491b2a7d4b94d00a10daf20e5926b1cca40f
