[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CACRpkdZnovdXWdm3udHXtfobPUiovTTSJ5WOKKw+QrSVp+GpHA@mail.gmail.com>
Date: Thu, 15 Sep 2016 14:22:40 +0200
From: Linus Walleij <linus.walleij@...aro.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Kevin Hilman <khilman@...libre.com>,
Carlo Caione <carlo@...one.org>,
"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
"linux-kernel@...r.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
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.
Yours,
Linus Walleij
Powered by blists - more mailing lists