On 10/10/25 01:52, Elena Reshetova wrote:
> diff --git a/tools/arch/x86/include/asm/cpufeatures.h 
> b/tools/arch/x86/include/asm/cpufeatures.h
> index 06fc0479a23f..30761c905b7d 100644
> --- a/tools/arch/x86/include/asm/cpufeatures.h
> +++ b/tools/arch/x86/include/asm/cpufeatures.h
> @@ -495,6 +495,7 @@
>  #define X86_FEATURE_TSA_SQ_NO                (21*32+11) /* AMD CPU not 
> vulnerable to TSA-SQ */
>  #define X86_FEATURE_TSA_L1_NO                (21*32+12) /* AMD CPU not 
> vulnerable to TSA-L1 */
>  #define X86_FEATURE_CLEAR_CPU_BUF_VM (21*32+13) /* Clear CPU buffers using 
> VERW before VMRUN */
> +#define X86_FEATURE_SGX_EUPDATESVN   (21*32+16) /* Support for 
> ENCLS[EUPDATESVN] instruction */

Sorry I didn't catch this before, but we don't patch this tools/ file
for individual features. We just sync the main copy over to here from
time to time. This hunk needs to die.

Second, please don't send things during the merge window. That's both
because we're busy, but also because I'm going to merge your code on top
of $VERSION-rc1. I'm not sure what you rebased to, but things don't
apply cleanly now.

Can you please fix the tools/ thing, rebase this on -rc1, retest and resend?

Reply via email to