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
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
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
>>
>>
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:
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
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
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
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
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
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
10 matches
Mail list logo