Subject: Re: linux-next: manual merge of the amlogic tree with the pinctrl tree

From: Kevin Hilman <[email-masked]>
Date: Thu, 15 Sep 2016 14:18:01 -0700

Linus Walleij <[email-masked]> writes:

> On Thu, Sep 15, 2016 at 2:19 AM, Stephen Rothwell <[email-masked]> 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