On Thu, Mar 23, 2017 at 2:27 AM, Linus Walleij <linus.walleij@xxxxxxxxxx> wrote: > On Mon, Mar 20, 2017 at 5:03 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html