diff for duplicates of <20191118231343.GA231930@google.com>

diff --git a/a/1.txt b/N1/1.txt
index 65d468a..5572f47 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -250,3 +250,9 @@ index ea94cf8f9dc6..3e85017a9c8b 100644
  	sdei_exit_mode = (conduit == CONDUIT_HVC) ? SDEI_EXIT_HVC : SDEI_EXIT_SMC;
  
  #ifdef CONFIG_UNMAP_KERNEL_AT_EL0
+
+
+_______________________________________________
+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 45a95e0..0c7bbba 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -7,23 +7,23 @@
  "Subject\0Re: [PATCH v5 14/14] arm64: implement Shadow Call Stack\0"
  "Date\0Mon, 18 Nov 2019 15:13:43 -0800\0"
  "To\0Mark Rutland <mark.rutland@arm.com>\0"
- "Cc\0Will Deacon <will@kernel.org>"
-  Catalin Marinas <catalin.marinas@arm.com>
-  Steven Rostedt <rostedt@goodmis.org>
-  Masami Hiramatsu <mhiramat@kernel.org>
+ "Cc\0Kees Cook <keescook@chromium.org>"
   Ard Biesheuvel <ard.biesheuvel@linaro.org>
-  Dave Martin <Dave.Martin@arm.com>
-  Kees Cook <keescook@chromium.org>
-  Laura Abbott <labbott@redhat.com>
-  Marc Zyngier <maz@kernel.org>
-  Nick Desaulniers <ndesaulniers@google.com>
+  Masahiro Yamada <yamada.masahiro@socionext.com>
+  Catalin Marinas <catalin.marinas@arm.com>
   Jann Horn <jannh@google.com>
+  Nick Desaulniers <ndesaulniers@google.com>
+  LKML <linux-kernel@vger.kernel.org>
+  Steven Rostedt <rostedt@goodmis.org>
   Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
-  Masahiro Yamada <yamada.masahiro@socionext.com>
   clang-built-linux <clang-built-linux@googlegroups.com>
+  Masami Hiramatsu <mhiramat@kernel.org>
+  Marc Zyngier <maz@kernel.org>
   Kernel Hardening <kernel-hardening@lists.openwall.com>
-  linux-arm-kernel <linux-arm-kernel@lists.infradead.org>
- " LKML <linux-kernel@vger.kernel.org>\0"
+  Laura Abbott <labbott@redhat.com>
+  Will Deacon <will@kernel.org>
+  Dave Martin <Dave.Martin@arm.com>
+ " linux-arm-kernel <linux-arm-kernel@lists.infradead.org>\0"
  "\00:1\0"
  "b\0"
  "On Fri, Nov 15, 2019 at 12:19:20PM -0800, Sami Tolvanen wrote:\n"
@@ -277,6 +277,12 @@
  "+\n"
  " \tsdei_exit_mode = (conduit == CONDUIT_HVC) ? SDEI_EXIT_HVC : SDEI_EXIT_SMC;\n"
  " \n"
-  #ifdef CONFIG_UNMAP_KERNEL_AT_EL0
+ " #ifdef CONFIG_UNMAP_KERNEL_AT_EL0\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
 
-006971fedfcfa0fae3d376f435e487b5b2d64e021a15958e36448147adc634db
+880ed85ea38fc0bb9b98ba7ad1e8e2ec33abfd390ce07a6a116b027c35279bcd
