Re: linux-next: manual merge of the gpio tree with the input tree
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 development, not simply to resolve conflicts. I have no problem carrying the merge fix. -- Cheers, Stephen Rothwell
Re: linux-next: manual merge of the gpio tree with the input tree
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: 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.
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.
Thanks.
--
Dmitry
Re: linux-next: manual merge of the gpio tree with the input tree
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 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
Re: linux-next: manual merge of the gpio tree with the input tree
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 the input tree and commit:
>
> c5097538c86a ("Input: soc_button_array - Propagate error from
> gpiod_count()")
>
> from the gpio tree.
>
> 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.
The fix is correct.
Thank you, Stephen.
--
Andy Shevchenko
Intel Finland Oy
