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

[Linus Walleij]

On Thu, May 12, 2016 at 6:17 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.

Yeah this is trivial and ACKed by the MIPS mainatainer so should be
safe, thanks!

Yours,
Linus Walleij