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

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the gpio tree with the input tree
Date	2017-03-24 00:00 +0100
Message-ID	<tojS2-ER-13@gated-at.bofh.it> (permalink)
References	<tmWXv-7In-5@gated-at.bofh.it> <to7eb-eW-41@gated-at.bofh.it> <todWj-4QN-41@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Dmitry,

On Thu, 23 Mar 2017 09:30:49 -0700 Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote:
>
> I think the fix is trivial and if it does not both Stephen to carry it
> on we'll let the other Linus resolve it in his tree when merging. I
> think he prefers to have cross-tree merges only happen when it is
> needed for development, not simply to resolve conflicts.

I have no problem carrying the merge fix.

-- 
Cheers,
Stephen Rothwell

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

Thread

linux-next: manual merge of the gpio tree with the input tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-03-20 05:20 +0100
  Re: linux-next: manual merge of the gpio tree with the input tree Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-03-20 12:00 +0100
  Re: linux-next: manual merge of the gpio tree with the input tree Linus Walleij <linus.walleij@linaro.org> - 2017-03-23 10:30 +0100
    Re: linux-next: manual merge of the gpio tree with the input tree Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-03-23 17:40 +0100
      Re: linux-next: manual merge of the gpio tree with the input tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-03-24 00:00 +0100

csiph-web