Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1483783 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-09-15 02:20 +0200 |
| Last post | 2016-09-15 23:20 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
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
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-09-15 02:20 +0200 |
| Subject | linux-next: manual merge of the amlogic tree with the pinctrl tree |
| Message-ID | <shszf-83M-15@gated-at.bofh.it> |
Hi all,
Today's linux-next merge of the amlogic tree got a conflict in:
drivers/base/pinctrl.c
between commit:
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.
I fixed it up (I used the version from the pinctrl tree) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging. You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
[toc] | [next] | [standalone]
| From | Linus Walleij <linus.walleij@linaro.org> |
|---|---|
| Date | 2016-09-15 14:30 +0200 |
| Message-ID | <shDXI-6Zf-37@gated-at.bofh.it> |
| In reply to | #1483783 |
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.
Yours,
Linus Walleij
[toc] | [prev] | [next] | [standalone]
| From | Kevin Hilman <khilman@baylibre.com> |
|---|---|
| Date | 2016-09-15 23:20 +0200 |
| Message-ID | <shMeB-3PX-5@gated-at.bofh.it> |
| In reply to | #1484100 |
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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web