linux-kernel - Re: linux-next: manual merge of the amlogic tree with the pinctrl 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] [day] [month] [year] [list]

Message-ID: <7h60pwlv5i.fsf@baylibre.com>
Date:   Thu, 15 Sep 2016 14:18:01 -0700
From:   Kevin Hilman <khilman@...libre.com>
To:     Linus Walleij <linus.walleij@...aro.org>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Carlo Caione <carlo@...one.org>,
        "linux-next\@vger.kernel.org" <linux-next@...r.kernel.org>,
        "linux-kernel\@vger.kernel.org" <linux-kernel@...r.kernel.org>,
        Deepak <deepak_das@...tor.com>
Subject: Re: linux-next: manual merge of the amlogic tree with the pinctrl tree

Linus Walleij <linus.walleij@...aro.org> writes:

> On Thu, Sep 15, 2016 at 2:19 AM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
>>   23b4ed268076 ("driver: base: pinctrl: return error from pinctrl_bind_pins()")
>>
>> from the pinctrl tree and commit:
>>
>>   eb4ec68acf5e ("driver: base: pinctrl: return error from pinctrl_bind_pins()")
>>
>> from the amlogic tree.
>
> That should not be in the amlogic tree.
>
> Carlo, Deepak etc: Please make sure it goes away from there.

It in the amlogic tree because I merged your pinctrl/devel into my
integration branch for testing, but appears the one I merged was
out-dated.  Fixed.

Kevin