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

Boris Ostrovsky
2016-07-26T14:01:07Z

On 07/26/2016 12:01 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the xen-tip tree got a conflict in:
>
> arch/x86/xen/enlighten.c
>
> between commit:
>
> 4c9075835511 ("xen/x86: Move irq allocation from Xen smp_op.cpu_up()")
>
> from the tip tree and commit:
>
> 88e957d6e47f ("xen: introduce xen_vcpu_id mapping")
>
> from the xen-tip tree.
>
> I fixed it up (I think - 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.
>

Thank you Stephen. Both this and arch/x86/xen/smp.c merges (from another
message) look good.

-boris