Re: linux-next: manual merge of the gpio tree with the arm-soc tree
From: Stephen Rothwell
Date: Wed Oct 05 2016 - 18:41:25 EST
On Tue, 27 Sep 2016 15:05:42 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Today's linux-next merge of the gpio tree got a conflict in:
> between commit:
> 9b7141d01a76 ("ARM: OMAP2+: Drop legacy board file for n900")
> from the arm-soc tree and commit:
> 9132ce450bd1 ("ARM: omap2: fix missing include")
> from the gpio tree.
> I fixed it up (the former removed the file, so I did that) 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.
Since Linus (Torvalds) has merged the gpio tree, this conflict (and
file removal) now affects the merge of the arm-soc tree).