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

[Borislav Petkov]

On July 8, 2026 2:59:07 PM UTC, Mark Brown <broonie@xxxxxxxxxx> wrote:
>diff --cc arch/x86/kvm/x86.c
>index 63daa4dfa23ad,0626e835e9eb7..0000000000000
>--- a/arch/x86/kvm/x86.c
>+++ b/arch/x86/kvm/x86.c
>diff --git a/arch/x86/kvm/msrs.c b/arch/x86/kvm/msrs.c
>index c230b18d87e38..861d04bfa63dd 100644
>--- a/arch/x86/kvm/msrs.c
>+++ b/arch/x86/kvm/msrs.c
>@@ -651,7 +651,7 @@ static int set_efer(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
> 	if ((efer ^ old_efer) & KVM_MMU_EFER_ROLE_BITS)
> 		kvm_mmu_reset_context(vcpu);
> 
>-	if (!static_cpu_has(X86_FEATURE_XSAVES) &&
>+	if (!cpu_feature_enabled(X86_FEATURE_XSAVES) &&
> 	    (efer & EFER_SVME))
> 		kvm_hv_xsaves_xsavec_maybe_warn(vcpu);

Yap, LGTM.

Thx.

-- 
Small device. Typos and formatting crap