Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1484549
| From | Kevin Hilman <khilman@baylibre.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the amlogic tree with the pinctrl tree |
| Date | 2016-09-15 23:20 +0200 |
| Message-ID | <shMeB-3PX-5@gated-at.bofh.it> (permalink) |
| References | <shszf-83M-15@gated-at.bofh.it> <shDXI-6Zf-37@gated-at.bofh.it> |
| Organization | BayLibre |
Linus Walleij <linus.walleij@linaro.org> writes:
> On Thu, Sep 15, 2016 at 2:19 AM, Stephen Rothwell <sfr@canb.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
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
linux-next: manual merge of the amlogic tree with the pinctrl tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-09-15 02:20 +0200
Re: linux-next: manual merge of the amlogic tree with the pinctrl tree Linus Walleij <linus.walleij@linaro.org> - 2016-09-15 14:30 +0200
Re: linux-next: manual merge of the amlogic tree with the pinctrl tree Kevin Hilman <khilman@baylibre.com> - 2016-09-15 23:20 +0200
csiph-web