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

[Juergen Gross]

On 17.07.26 18:11, Mark Brown wrote:
> 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 c230b18d87e38..764cda8045a17 100644
> --- a/arch/x86/kvm/msrs.c
> +++ b/arch/x86/kvm/msrs.c
> @@ -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;
>   
>   	/*

The fix looks fine.


Juergen

Attachment: OpenPGP_0xB0DE9DD628BF132F.asc
Description: OpenPGP public key

Attachment: OpenPGP_signature.asc
Description: OpenPGP digital signature