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

[Ingo Molnar]

* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> Hi all,
> 
> Today's linux-next merge of the drivers-x86 tree got a conflict in:
> 
>   drivers/platform/x86/intel/speed_select_if/isst_if_common.c
> 
> between commit:
> 
>   6fa17efe4544 ("x86/msr: Rename 'wrmsrl_safe()' to 'wrmsrq_safe()'")
> 
> from the tip tree and commit:
> 
>   c935ddfe65da ("platform/x86: ISST: Do Not Restore SST MSRs on CPU Online Operation")
> 
> from the drivers-x86 tree.
> 
> I fixed it up (the latter removed the code that the former updated) 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.

LGTM, thanks!

	Ingo