On Mon, Mar 20, 2017 at 5:03 AM, Stephen Rothwell <[email protected]> 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
