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

[Paolo Bonzini]

On 2/12/26 15:08, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the kvm-x86 tree got conflicts in:
>
>    arch/x86/kvm/svm/svm.c
>    arch/x86/kvm/vmx/vmx.c
>
> between commit:
>
>    9e03b7caf4e65 ("Merge tag 'kvm-x86-misc-6.20' of https://github.com/kvm-x86/linux into HEAD")
>
> from the kvm tree and commit:
>
>    f8ade833b733a ("KVM: x86: Explicitly configure supported XSS from {svm,vmx}_set_cpu_caps()")
>
> 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.

Thanks, this is the tree that will go to Linus later today, so Sean will 
simply have to reset his tree to Linus's as usual.

Paolo

> diff --combined arch/x86/kvm/svm/svm.c
> index 8f8bc863e2143,5f0136dbdde6b..0000000000000
> --- a/arch/x86/kvm/svm/svm.c
> +++ b/arch/x86/kvm/svm/svm.c
> @@@ -5389,6 -5389,7 +5389,6 @@@ static __init void svm_set_cpu_caps(voi
>    	kvm_cpu_cap_clear(X86_FEATURE_MSR_IMM);
>    
>    	kvm_setup_xss_caps();
>   -
>    	kvm_finalize_cpu_caps();
>    }
>    
> diff --combined arch/x86/kvm/vmx/vmx.c
> index 967b58a8ab9d0,11bb4b9332274..0000000000000
> --- a/arch/x86/kvm/vmx/vmx.c
> +++ b/arch/x86/kvm/vmx/vmx.c
> @@@ -8247,6 -8247,7 +8247,6 @@@ static __init void vmx_set_cpu_caps(voi
>    	}
>    
>    	kvm_setup_xss_caps();
>   -
>    	kvm_finalize_cpu_caps();
>    }
>