diff for duplicates of <20191010083613.611304454@linuxfoundation.org>

diff --git a/a/1.txt b/N1/1.txt
index 0c94347..36fc57b 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -39,10 +39,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	if (psci_ops.smccc_version == SMCCC_VERSION_1_0) {
  		ssbd_state = ARM64_SSBD_UNKNOWN;
  		if (!this_cpu_safe)
-
-
-
-_______________________________________________
-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 2982f45..bdf1ac3 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,8 +5,8 @@
  "To\0linux-kernel@vger.kernel.org"
  " linux-arm-kernel@lists.infradead.org\0"
  "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
-  Will Deacon <will.deacon@arm.com>
   stable@vger.kernel.org
+  Will Deacon <will.deacon@arm.com>
  " Ard Biesheuvel <ard.biesheuvel@linaro.org>\0"
  "\00:1\0"
  "b\0"
@@ -50,13 +50,6 @@
  "-\n"
  " \tif (psci_ops.smccc_version == SMCCC_VERSION_1_0) {\n"
  " \t\tssbd_state = ARM64_SSBD_UNKNOWN;\n"
- " \t\tif (!this_cpu_safe)\n"
- "\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\tif (!this_cpu_safe)"
 
-2c80c5dcaa2897e7b262203240160042ebd1786de3561ad99acf630f7b0233be
+5904c53c631fbaf104be29d7c6beb94fe2914be4696f79c5f29a96829638c41f
