diff for duplicates of <20200417231937.GA214321@google.com>

diff --git a/a/1.txt b/N1/1.txt
index 20ec549..4281dc2 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -11,3 +11,8 @@ gets pushed to the shadow stack, so there was no conflict with SCS. I
 confirmed this on arm64, but haven't looked at other architectures.
 
 Sami
+
+_______________________________________________
+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 3b7582c..8771650 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -9,29 +9,28 @@
  "Subject\0Re: [PATCH v11 04/12] scs: disable when function graph tracing is enabled\0"
  "Date\0Fri, 17 Apr 2020 16:19:37 -0700\0"
  "To\0Mark Rutland <mark.rutland@arm.com>\0"
- "Cc\0Peter Zijlstra <peterz@infradead.org>"
-  Will Deacon <will@kernel.org>
+ "Cc\0Juri Lelli <juri.lelli@redhat.com>"
+  kernel-hardening@lists.openwall.com
+  Peter Zijlstra <peterz@infradead.org>
   Catalin Marinas <catalin.marinas@arm.com>
-  James Morse <james.morse@arm.com>
-  Steven Rostedt <rostedt@goodmis.org>
-  Ard Biesheuvel <ard.biesheuvel@linaro.org>
+  Will Deacon <will@kernel.org>
+  Marc Zyngier <maz@kernel.org>
   Masahiro Yamada <masahiroy@kernel.org>
-  Michal Marek <michal.lkml@markovi.net>
+  clang-built-linux@googlegroups.com
   Ingo Molnar <mingo@redhat.com>
-  Juri Lelli <juri.lelli@redhat.com>
-  Vincent Guittot <vincent.guittot@linaro.org>
+  Laura Abbott <labbott@redhat.com>
   Dave Martin <Dave.Martin@arm.com>
   Kees Cook <keescook@chromium.org>
-  Laura Abbott <labbott@redhat.com>
-  Marc Zyngier <maz@kernel.org>
-  Masami Hiramatsu <mhiramat@kernel.org>
-  Nick Desaulniers <ndesaulniers@google.com>
   Jann Horn <jannh@google.com>
-  Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
-  clang-built-linux@googlegroups.com
-  kernel-hardening@lists.openwall.com
+  Steven Rostedt <rostedt@goodmis.org>
   linux-arm-kernel@lists.infradead.org
- " linux-kernel@vger.kernel.org\0"
+  Michal Marek <michal.lkml@markovi.net>
+  Ard Biesheuvel <ard.biesheuvel@linaro.org>
+  Nick Desaulniers <ndesaulniers@google.com>
+  linux-kernel@vger.kernel.org
+  Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
+  James Morse <james.morse@arm.com>
+ " Masami Hiramatsu <mhiramat@kernel.org>\0"
  "\00:1\0"
  "b\0"
  "On Fri, Apr 17, 2020 at 04:46:14PM +0100, Mark Rutland wrote:\n"
@@ -46,6 +45,11 @@
  "gets pushed to the shadow stack, so there was no conflict with SCS. I\n"
  "confirmed this on arm64, but haven't looked at other architectures.\n"
  "\n"
- Sami
+ "Sami\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
 
-1d9d49c360654f72387bf0598d6df9562e54dfd641fa145ec5f02cb1c88aefed
+9f5b38eae106277620f9c9f784c9ea6cfe31705b11edd30eeba238bf304fbe49
