From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 May 2025 07:22:26 +0000 (+1000)
Subject: Merge branch 'next' of https://github.com/kvm-x86/linux.git
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5e462c1a1b4575e7faac7a55b46ecf839f2a4fb1;p=users%2Fhch%2Fmisc.git

Merge branch 'next' of https://github.com/kvm-x86/linux.git
---

5e462c1a1b4575e7faac7a55b46ecf839f2a4fb1
diff --cc arch/x86/kvm/svm/svm.c
index ffb34dadff1c,b36a7e886d4e..d93374557263
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@@ -29,9 -29,9 +29,10 @@@
  #include <linux/cc_platform.h>
  #include <linux/smp.h>
  #include <linux/string_choices.h>
+ #include <linux/mutex.h>
  
  #include <asm/apic.h>
 +#include <asm/msr.h>
  #include <asm/perf_event.h>
  #include <asm/tlbflush.h>
  #include <asm/desc.h>