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

From	Linus Walleij <linus.walleij@linaro.org>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the gpio tree with the staging tree
Date	2017-01-30 18:40 +0100
Message-ID	<t5o5Q-6Mu-27@gated-at.bofh.it> (permalink)
References	<t5c4F-7WV-9@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Mon, Jan 30, 2017 at 5:28 AM, Stephen Rothwell <sfr@canb.auug.org.au> 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

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the gpio tree with the staging tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-01-30 05:50 +0100
  Re: linux-next: manual merge of the gpio tree with the staging tree Greg KH <greg@kroah.com> - 2017-01-30 18:10 +0100
  Re: linux-next: manual merge of the gpio tree with the staging tree Linus Walleij <linus.walleij@linaro.org> - 2017-01-30 18:40 +0100

csiph-web