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

[Linus Walleij]

On Mon, Jan 30, 2017 at 5:28 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> 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.

OK I'll mention it to Linus (the big penguin). Thanks!

Linus Walleij