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

[Ingo Molnar]

* Mark Brown <broonie@xxxxxxxxxx> wrote:

> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   drivers/hwmon/coretemp.c
> 
> between commit:
> 
>   1b16a26e79433 ("hwmon: (coretemp) fix coding style issues")
> 
> from the hwmon-staging tree and commit:
> 
>   91660aae2f864 ("x86/msr: Switch rdmsr_safe_on_cpu() users to rdmsrq_safe_on_cpu()")
> 
> from the tip 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 --cc drivers/hwmon/coretemp.c
> index 02b4e46d965b9,70711a7cca123..0000000000000
> --- a/drivers/hwmon/coretemp.c
> +++ b/drivers/hwmon/coretemp.c
> @@@ -220,13 -220,14 +220,13 @@@ static int adjust_tjmax(struct cpuinfo_
>   		 * http://softwarecommunity.intel.com/Wiki/Mobility/720.htm
>   		 * For Core2 cores, check MSR 0x17, bit 28 1 = Mobile CPU
>   		 */
> - 		err = rdmsr_safe_on_cpu(id, 0x17, &eax, &edx);
> + 		err = rdmsrq_safe_on_cpu(id, 0x17, &val);

> - 		err = rdmsr_safe_on_cpu(id, 0xee, &eax, &edx);
> + 		err = rdmsrq_safe_on_cpu(id, 0xee, &val);

> - 	u32 eax, edx;
> + 	struct msr val;

> - 	u32 eax, edx;
> + 	struct msr val;

Looks good, thank you!

	Ingo