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

[Borislav Petkov]

On Tue, Nov 25, 2025 at 03:59:53PM +1100, Stephen Rothwell wrote:
> diff --cc arch/x86/include/asm/cpufeatures.h
> index d90ce601917c,646d2a77a2e2..000000000000
> --- a/arch/x86/include/asm/cpufeatures.h
> +++ b/arch/x86/include/asm/cpufeatures.h
> @@@ -503,9 -500,12 +504,15 @@@
>   #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_SDCIAE		(21*32+18) /* L3 Smart Data Cache Injection Allocation Enforcement */
> ++#define X86_FEATURE_X2AVIC_EXT		(21*32+19) /* AMD SVM x2AVIC support for 4k vCPUs */
> ++#define X86_FEATURE_CLEAR_CPU_BUF_VM_MMIO (21*32+20) /*
> + 						      * 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).
> + 						      */

Yeah, I caught this already during review, we will make sure to let Linus know
when we send the pull requests.

Thx.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette