diff for duplicates of <20200622103932.GA178085@google.com>

diff --git a/a/1.txt b/N1/1.txt
index f5a1fec..cc6985f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -61,8 +61,4 @@ sounds like a counter of macros rather than specifically a unique label
 generator. It may work most of the time but also seems that it has the
 potential to be more fragile given that it would change based on the
 rest of the code in the file to potentially conflict with something it
-didn't previously conflict with. 
-_______________________________________________
-kvmarm mailing list
-kvmarm@lists.cs.columbia.edu
-https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
+didn't previously conflict with.
diff --git a/a/content_digest b/N1/content_digest
index c09955c..83b938c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,12 +5,15 @@
  "Subject\0Re: [PATCH v2 5/5] KVM: arm64: Simplify PtrAuth alternative patching\0"
  "Date\0Mon, 22 Jun 2020 11:39:32 +0100\0"
  "To\0Mark Rutland <mark.rutland@arm.com>\0"
- "Cc\0kvm@vger.kernel.org"
-  Marc Zyngier <maz@kernel.org>
-  Dave Martin <Dave.Martin@arm.com>
+ "Cc\0Marc Zyngier <maz@kernel.org>"
+  kvm@vger.kernel.org
   linux-arm-kernel@lists.infradead.org
-  kernel-team@android.com
- " kvmarm@lists.cs.columbia.edu\0"
+  kvmarm@lists.cs.columbia.edu
+  James Morse <james.morse@arm.com>
+  Julien Thierry <julien.thierry.kdev@gmail.com>
+  Suzuki K Poulose <suzuki.poulose@arm.com>
+  Dave Martin <Dave.Martin@arm.com>
+ " kernel-team@android.com\0"
  "\00:1\0"
  "b\0"
  "On Mon, Jun 22, 2020 at 10:15:08AM +0100, Mark Rutland wrote:\n"
@@ -76,10 +79,6 @@
  "generator. It may work most of the time but also seems that it has the\n"
  "potential to be more fragile given that it would change based on the\n"
  "rest of the code in the file to potentially conflict with something it\n"
- "didn't previously conflict with. \n"
- "_______________________________________________\n"
- "kvmarm mailing list\n"
- "kvmarm@lists.cs.columbia.edu\n"
- https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
+ didn't previously conflict with.
 
-4c9fcf500a08a558455eea2f55703ee55733c4e0d40bb850cb161cd6302285e8
+8f93b0afeb472fc3b264995d6a54255b25b0429f326a7b396e99c38df0a56d92
