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

2017-03-23 Thread Stephen Rothwell
Hi Dmitry, On Thu, 23 Mar 2017 09:30:49 -0700 Dmitry Torokhov 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

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

2017-03-23 Thread Stephen Rothwell
Hi Dmitry, On Thu, 23 Mar 2017 09:30:49 -0700 Dmitry Torokhov 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

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

2017-03-23 Thread Dmitry Torokhov
On Thu, Mar 23, 2017 at 2:27 AM, Linus Walleij wrote: > On Mon, Mar 20, 2017 at 5:03 AM, Stephen Rothwell > wrote: >> Hi Linus, >> >> Today's linux-next merge of the gpio tree got a conflict in: >> >> drivers/input/misc/soc_button_array.c >> >>

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

2017-03-23 Thread Dmitry Torokhov
On Thu, Mar 23, 2017 at 2:27 AM, Linus Walleij wrote: > On Mon, Mar 20, 2017 at 5:03 AM, Stephen Rothwell > 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:

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

2017-03-23 Thread Linus Walleij
On Mon, Mar 20, 2017 at 5:03 AM, Stephen Rothwell 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

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

2017-03-23 Thread Linus Walleij
On Mon, Mar 20, 2017 at 5:03 AM, Stephen Rothwell 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

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

2017-03-20 Thread Andy Shevchenko
On Mon, 2017-03-20 at 15:03 +1100, Stephen Rothwell 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

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

2017-03-20 Thread Andy Shevchenko
On Mon, 2017-03-20 at 15:03 +1100, Stephen Rothwell 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

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

2017-03-19 Thread Stephen Rothwell
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

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

2017-03-19 Thread Stephen Rothwell
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