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

[Nicolas Ferre <nicolas.ferre@xxxxxxxxxxxxx>]

On 18/09/2018 at 05:12, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
>    MAINTAINERS
>
> between commit:
>
>    5ae2f1f30197 ("MAINTAINERS: move former ATMEL entries to proper MICROCHIP locatioat91n")
>
> from the at91 tree and commit:
>
>    010de20412fc ("MAINTAINERS: Add entry for mcp3911 ADC driver")
>
> from the staging 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.

Resolution looks good to me.

Thanks. Best regards,
--
Nicolas Ferre