diff for duplicates of <jhjo8onkuq5.mognet@arm.com>

diff --git a/a/1.txt b/N1/1.txt
index 38f13eb..62f742f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -23,8 +23,3 @@ If we really care, these two could be marked as __read_mostly.
 >  #ifdef CONFIG_HOTPLUG_CPU
 >  static int op_cpu_kill(unsigned int cpu);
 >  #else
-
-_______________________________________________
-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 6e558c7..e979786 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,18 +4,18 @@
  "Subject\0Re: [PATCH v2 03/17] arm64: Allow IPIs to be handled as normal interrupts\0"
  "Date\0Fri, 10 Jul 2020 20:58:42 +0100\0"
  "To\0Marc Zyngier <maz@kernel.org>\0"
- "Cc\0Sumit Garg <sumit.garg@linaro.org>"
-  Florian Fainelli <f.fainelli@gmail.com>
+ "Cc\0linux-arm-kernel@lists.infradead.org"
+  linux-kernel@vger.kernel.org
+  Will Deacon <will@kernel.org>
+  Catalin Marinas <catalin.marinas@arm.com>
   Russell King <linux@arm.linux.org.uk>
+  Thomas Gleixner <tglx@linutronix.de>
   Jason Cooper <jason@lakedaemon.net>
-  kernel-team@android.com
-  Andrew Lunn <andrew@lunn.ch>
-  Catalin Marinas <catalin.marinas@arm.com>
+  Sumit Garg <sumit.garg@linaro.org>
+  Florian Fainelli <f.fainelli@gmail.com>
   Gregory Clement <gregory.clement@bootlin.com>
-  linux-kernel@vger.kernel.org
-  Thomas Gleixner <tglx@linutronix.de>
-  Will Deacon <will@kernel.org>
- " linux-arm-kernel@lists.infradead.org\0"
+  Andrew Lunn <andrew@lunn.ch>
+ " kernel-team@android.com\0"
  "\00:1\0"
  "b\0"
  "\n"
@@ -42,11 +42,6 @@
  "> +\n"
  ">  #ifdef CONFIG_HOTPLUG_CPU\n"
  ">  static int op_cpu_kill(unsigned int cpu);\n"
- ">  #else\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
+ >  #else
 
-b28948558bea895a70afc3b523d701dcdb2a48cc1ff9052b46692abcd6f30f80
+e950f1ef663282645d2a56e9e8fc256f63ed93cabc22302e5fa2158741c83403
