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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CACRpkdaDUUDkEqYRRp4St=uPs5Z2TRX1XT14+yvsdLiitBaCdg@mail.gmail.com>
Date:   Thu, 23 Mar 2017 10:27:10 +0100
From:   Linus Walleij <linus.walleij@...aro.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Dmitry Torokhov <dmitry.torokhov@...il.com>
Cc:     "linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
        Hans de Goede <hdegoede@...hat.com>
Subject: Re: linux-next: manual merge of the gpio tree with the input tree

On Mon, Mar 20, 2017 at 5:03 AM, Stephen Rothwell <sfr@...b.auug.org.au> 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