Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/x86.c between commits: 3eaa50e1e255e ("x86/cpu: Hide and rename static_cpu_has()") 1620ddc0dcefc ("KVM/x86: Stop using 32-bit MSR interfaces") from the tip tree and commit: 7a26830801584 ("KVM: x86: Move the bulk of MSR specific code from x86.c to msrs.{c,h}") from the kvm 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. diff --git a/arch/x86/kvm/msrs.c b/arch/x86/kvm/msrs.c index XXXXXXX..XXXXXXX 100644 --- a/arch/x86/kvm/msrs.c +++ b/arch/x86/kvm/msrs.c @@ -XXX,XX +XXX,XX @@ static void kvm_probe_feature_msr(u32 msr_index) static void kvm_probe_msr_to_save(u32 msr_index) { - u32 dummy[2]; + u64 dummy; - if (rdmsr_safe(msr_index, &dummy[0], &dummy[1])) + if (rdmsrq_safe(msr_index, &dummy)) return; /* Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/Kconfig between commit: 28d11e4548b7 ("x86/fred: KVM: VMX: Always use FRED for IRQs when CONFIG_X86_FRED=y") from the tip tree and commit: 924121eebddc ("KVM: x86: Select TDX's KVM_GENERIC_xxx dependencies iff CONFIG_KVM_INTEL_TDX=y") from the kvm 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. -- Cheers, Stephen Rothwell diff --cc arch/x86/kvm/Kconfig index b92ef117f355,4e43923656d0..000000000000 --- a/arch/x86/kvm/Kconfig +++ b/arch/x86/kvm/Kconfig @@@ -95,9 -96,6 +96,7 @@@ config KVM_SW_PROTECTED_V config KVM_INTEL tristate "KVM for Intel (and compatible) processors support" depends on KVM && IA32_FEAT_CTL - select KVM_GENERIC_PRIVATE_MEM if INTEL_TDX_HOST - select KVM_GENERIC_MEMORY_ATTRIBUTES if INTEL_TDX_HOST + select X86_FRED if X86_64 help Provides support for KVM on processors equipped with Intel's VT extensions, a.k.a. Virtual Machine Extensions (VMX).