Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1607297

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

Show all headers | View raw

On Mon, Mar 20, 2017 at 5:03 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Linus,
>
> Today's linux-next merge of the gpio tree got a conflict in:
>
>   drivers/input/misc/soc_button_array.c
>
> between commit:
>
>   a01cd17000a4 ("Input: soc_button_array - use NULL for GPIO connection ID")
>
> from the input tree and commit:
>
>   c5097538c86a ("Input: soc_button_array - Propagate error from gpiod_count()")
>
> from the gpio tree.

Dmitry, I could pick the commit from the input tree and apply
Stephen's solution and put the result in the GPIO tree if you think
it's a good idea.

Yours,
Linus Walleij

Back to linux.kernel | Previous | Next — Previous in thread | Next 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