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

[Linus Walleij]

On Thu, Sep 15, 2016 at 2:19 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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.

Yours,
Linus Walleij