Subject: linux-next: manual merge of the kvm-x86 tree with the tip tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 20 Nov 2025 15:46:28 +1100

Hi all,

Today's linux-next merge of the kvm-x86 tree got a conflict in:

  arch/x86/include/asm/cpufeatures.h

between commit:

  6ffdb49101f0 ("x86/cpufeatures: Add X86_FEATURE_SGX_EUPDATESVN feature flag")

from the tip tree and commits:

  5d0316e25def ("x86/cpufeatures: Add X86_FEATURE_X2AVIC_EXT")
  f6106d41ec84 ("x86/bugs: Use an x86 feature to track the MMIO Stale Data mitigation")
  9c6bbdaab7e6 ("Merge branch 'svm'")

from the kvm-x86 tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/x86/include/asm/cpufeatures.h
index b6472e252491,646d2a77a2e2..000000000000
--- a/arch/x86/include/asm/cpufeatures.h
+++ b/arch/x86/include/asm/cpufeatures.h
@@@ -503,7 -500,12 +504,13 @@@
  #define X86_FEATURE_IBPB_EXIT_TO_USER	(21*32+14) /* Use IBPB on exit-to-userspace, see VMSCAPE bug */
  #define X86_FEATURE_ABMC		(21*32+15) /* Assignable Bandwidth Monitoring Counters */
  #define X86_FEATURE_MSR_IMM		(21*32+16) /* MSR immediate form instructions */
 -#define X86_FEATURE_X2AVIC_EXT		(21*32+17) /* AMD SVM x2AVIC support for 4k vCPUs */
 -#define X86_FEATURE_CLEAR_CPU_BUF_VM_MMIO (21*32+18) /*
 +#define X86_FEATURE_SGX_EUPDATESVN	(21*32+17) /* Support for ENCLS[EUPDATESVN] instruction */
++#define X86_FEATURE_X2AVIC_EXT		(21*32+18) /* AMD SVM x2AVIC support for 4k vCPUs */
++#define X86_FEATURE_CLEAR_CPU_BUF_VM_MMIO (21*32+19) /*
+ 						      * Clear CPU buffers before VM-Enter if the vCPU
+ 						      * can access host MMIO (ignored for all intents
+ 						      * and purposes if CLEAR_CPU_BUF_VM is set).
+ 						      */
  
  /*
   * BUG word(s)