Skip to contentSkip to conversation

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

PATCH Mark Brown 2 participants 2 messages Jul 17 – Jul 18

Subsystems (4)
x86 KVM Linux-next tree KVM x86
lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

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.

arch/x86/kvm/msrs.c +2 -2
index c230b18d87e38..764cda8045a17 100644
@@ -2579,9 +2579,9 @@ 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;
 
 	/*
#1 lore raw
Quoted 30 lines · Mark Brown

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.

arch/x86/kvm/msrs.c +0 -0
index c230b18d87e38..764cda8045a17 100644
@@ -2579,9 +2579,9 @@ static void kvm_probe_feature_msr(u32 msr_index)

arch/x86/kvm/msrs.c static void kvm_probe_feature_msr(u32 msr_index) · line 2587

Quoted 10 lines
arch/x86/kvm/msrs.c +2 -2
  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;
 
  	/*

The fix looks fine.

Juergen