linux-next: manual merge of the kvm-x86 tree with the kvm tree
Subsystems (3)
Mark Brown
maintainerHi 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.
arch/x86/kvm/svm/svm.c +0 -0
@@@ -5389,6 -5389,7 +5389,6 @@@ static __init void svm_set_cpu_caps(voikvm_cpu_cap_clear (X86_FEATURE_MSR_IMM );kvm_setup_xss_caps (); -kvm_finalize_cpu_caps (); }
arch/x86/kvm/vmx/vmx.c +0 -0
@@@ -8247,6 -8247,7 +8247,6 @@@ static __init void vmx_set_cpu_caps(voi }kvm_setup_xss_caps (); -kvm_finalize_cpu_caps (); }
Paolo Bonzini
maintainerQuoted 15 lines · Mark Brown
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.cbetween 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()")
Quoted 8 lines
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
Quoted 24 lines
arch/x86/kvm/svm/svm.c +0
-0@@@ -5389,6 -5389,7 +5389,6 @@@ static __init void svm_set_cpu_caps(voikvm_cpu_cap_clear (X86_FEATURE_MSR_IMM );kvm_setup_xss_caps (); -kvm_finalize_cpu_caps (); }arch/x86/kvm/vmx/vmx.c +0
-0@@@ -8247,6 -8247,7 +8247,6 @@@ static __init void vmx_set_cpu_caps(voi }kvm_setup_xss_caps (); -kvm_finalize_cpu_caps (); }
Sean Christopherson
maintainerQuoted 25 lines · Paolo Bonzini
Quoted 15 lines · Mark Brown
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.cbetween 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()")Quoted 8 lines
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.
Quoted 2 lines
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.
Done (reset base to kvm/next).