diff for duplicates of <Yh96ggLwtKAhu7xe@arm.com>

diff --git a/a/1.txt b/N1/1.txt
index 6a7a1f9..528e1ee 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -12,7 +12,8 @@ in via the same route. I don't think it's critical for 5.17 (unless
 there are pending fixes from Marc already; I don't have any for arm64).
 
 Acked-by: Catalin Marinas <catalin.marinas@arm.com>
+
 _______________________________________________
-kvmarm mailing list
-kvmarm@lists.cs.columbia.edu
-https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
+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 263283c..76fe9b2 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,9 +3,10 @@
  "Subject\0Re: [PATCH] KVM: arm64: Enable Cortex-A510 erratum 2077057 by default\0"
  "Date\0Wed, 2 Mar 2022 14:09:06 +0000\0"
  "To\0Mark Brown <broonie@kernel.org>\0"
- "Cc\0Marc Zyngier <maz@kernel.org>"
-  Will Deacon <will@kernel.org>
+ "Cc\0Will Deacon <will@kernel.org>"
+  Marc Zyngier <maz@kernel.org>
   linux-arm-kernel@lists.infradead.org
+  James Morse <james.morse@arm.com>
  " kvmarm@lists.cs.columbia.edu\0"
  "\00:1\0"
  "b\0"
@@ -23,9 +24,10 @@
  "there are pending fixes from Marc already; I don't have any for arm64).\n"
  "\n"
  "Acked-by: Catalin Marinas <catalin.marinas@arm.com>\n"
+ "\n"
  "_______________________________________________\n"
- "kvmarm mailing list\n"
- "kvmarm@lists.cs.columbia.edu\n"
- https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
+ "linux-arm-kernel mailing list\n"
+ "linux-arm-kernel@lists.infradead.org\n"
+ http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
-2627a9824a41cf16cbdbea0564cb1b441fce556dedd9ecf9ce6e728c491a088f
+dd6baaf8fa5423b5f01a54e2ffa0579f35dc82b2c0d6232180c7441ba155021f
