diff for duplicates of <YUO5J/jTMa2KGbsq@google.com>

diff --git a/a/1.txt b/N1/1.txt
index 009b098..94311f2 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -49,8 +49,4 @@ Either way works for me.  Paolo or Peter, do either of you have a preference?
 > -DEFINE_STATIC_CALL_RET0(x86_guest_handle_intel_pt_intr, *(perf_guest_cbs->handle_intel_pt_intr));
 > +DEFINE_STATIC_CALL_RET0(x86_guest_handle_intel_pt_intr, unsigned int (*)(void));
 
-FWIW, the param needs to be a raw function, not a function pointer. 
-_______________________________________________
-kvmarm mailing list
-kvmarm@lists.cs.columbia.edu
-https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
+FWIW, the param needs to be a raw function, not a function pointer.
diff --git a/a/content_digest b/N1/content_digest
index b114881..4036e62 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,44 +4,48 @@
  "Subject\0Re: [PATCH v2 00/13] perf: KVM: Fix, optimize, and clean up callbacks\0"
  "Date\0Thu, 16 Sep 2021 21:37:43 +0000\0"
  "To\0Peter Zijlstra <peterz@infradead.org>\0"
- "Cc\0Wanpeng Li <wanpengli@tencent.com>"
-  kvm@vger.kernel.org
-  Alexander Shishkin <alexander.shishkin@linux.intel.com>
+ "Cc\0Ingo Molnar <mingo@redhat.com>"
+  Arnaldo Carvalho de Melo <acme@kernel.org>
+  Will Deacon <will@kernel.org>
+  Mark Rutland <mark.rutland@arm.com>
   Catalin Marinas <catalin.marinas@arm.com>
+  Marc Zyngier <maz@kernel.org>
   Guo Ren <guoren@kernel.org>
-  H. Peter Anvin <hpa@zytor.com>
-  linux-riscv@lists.infradead.org
+  Nick Hu <nickhu@andestech.com>
+  Greentime Hu <green.hu@gmail.com>
   Vincent Chen <deanbo422@gmail.com>
-  Jiri Olsa <jolsa@redhat.com>
-  Boris Ostrovsky <boris.ostrovsky@oracle.com>
-  Stefano Stabellini <sstabellini@kernel.org>
-  xen-devel@lists.xenproject.org
-  Marc Zyngier <maz@kernel.org>
-  Joerg Roedel <joro@8bytes.org>
-  x86@kernel.org
-  linux-csky@vger.kernel.org
-  kvmarm@lists.cs.columbia.edu
-  Ingo Molnar <mingo@redhat.com>
-  Like Xu <like.xu.linux@gmail.com>
+  Paul Walmsley <paul.walmsley@sifive.com>
+  Palmer Dabbelt <palmer@dabbelt.com>
   Albert Ou <aou@eecs.berkeley.edu>
-  Zhu Lingshan <lingshan.zhu@intel.com>
-  Will Deacon <will@kernel.org>
-  Arnaldo Carvalho de Melo <acme@kernel.org>
+  Thomas Gleixner <tglx@linutronix.de>
   Borislav Petkov <bp@alien8.de>
-  Greentime Hu <green.hu@gmail.com>
-  Paul Walmsley <paul.walmsley@sifive.com>
+  x86@kernel.org
+  Paolo Bonzini <pbonzini@redhat.com>
+  Boris Ostrovsky <boris.ostrovsky@oracle.com>
+  Juergen Gross <jgross@suse.com>
+  Alexander Shishkin <alexander.shishkin@linux.intel.com>
+  Jiri Olsa <jolsa@redhat.com>
   Namhyung Kim <namhyung@kernel.org>
-  Thomas Gleixner <tglx@linutronix.de>
-  Artem Kashkanov <artem.kashkanov@intel.com>
-  linux-arm-kernel@lists.infradead.org
+  James Morse <james.morse@arm.com>
+  Alexandru Elisei <alexandru.elisei@arm.com>
+  Suzuki K Poulose <suzuki.poulose@arm.com>
+  H. Peter Anvin <hpa@zytor.com>
+  Vitaly Kuznetsov <vkuznets@redhat.com>
+  Wanpeng Li <wanpengli@tencent.com>
   Jim Mattson <jmattson@google.com>
-  Juergen Gross <jgross@suse.com>
-  Nick Hu <nickhu@andestech.com>
-  linux-kernel@vger.kernel.org
+  Joerg Roedel <joro@8bytes.org>
+  Stefano Stabellini <sstabellini@kernel.org>
   linux-perf-users@vger.kernel.org
-  Palmer Dabbelt <palmer@dabbelt.com>
-  Paolo Bonzini <pbonzini@redhat.com>
- " Vitaly Kuznetsov <vkuznets@redhat.com>\0"
+  linux-kernel@vger.kernel.org
+  linux-arm-kernel@lists.infradead.org
+  kvmarm@lists.cs.columbia.edu
+  linux-csky@vger.kernel.org
+  linux-riscv@lists.infradead.org
+  kvm@vger.kernel.org
+  xen-devel@lists.xenproject.org
+  Artem Kashkanov <artem.kashkanov@intel.com>
+  Like Xu <like.xu.linux@gmail.com>
+ " Zhu Lingshan <lingshan.zhu@intel.com>\0"
  "\00:1\0"
  "b\0"
  "On Sat, Aug 28, 2021, Peter Zijlstra wrote:\n"
@@ -95,10 +99,6 @@
  "> -DEFINE_STATIC_CALL_RET0(x86_guest_handle_intel_pt_intr, *(perf_guest_cbs->handle_intel_pt_intr));\n"
  "> +DEFINE_STATIC_CALL_RET0(x86_guest_handle_intel_pt_intr, unsigned int (*)(void));\n"
  "\n"
- "FWIW, the param needs to be a raw function, not a function pointer. \n"
- "_______________________________________________\n"
- "kvmarm mailing list\n"
- "kvmarm@lists.cs.columbia.edu\n"
- https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
+ FWIW, the param needs to be a raw function, not a function pointer.
 
-ddd2f152a57e35cc81a3e0c51929c3fcdb29a6c9c99de1fde603d41054c088f7
+844241339052a57a6e0b8bd45c9b369ce205a656a69ac4c5bbb3c669966deb84
