Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1491686 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-09-27 07:10 +0200 |
| Last post | 2016-10-06 09:00 +0200 |
| Articles | 4 — 3 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the gpio tree with the arm-soc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-09-27 07:10 +0200
Re: linux-next: manual merge of the gpio tree with the arm-soc tree Tony Lindgren <tony@atomide.com> - 2016-09-27 21:20 +0200
Re: linux-next: manual merge of the gpio tree with the arm-soc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-10-06 00:50 +0200
Re: linux-next: manual merge of the gpio tree with the arm-soc tree Linus Walleij <linus.walleij@linaro.org> - 2016-10-06 09:00 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-09-27 07:10 +0200 |
| Subject | linux-next: manual merge of the gpio tree with the arm-soc tree |
| Message-ID | <slSOu-5nJ-9@gated-at.bofh.it> |
Hi Linus,
Today's linux-next merge of the gpio tree got a conflict in:
arch/arm/mach-omap2/board-rx51-peripherals.c
between commit:
9b7141d01a76 ("ARM: OMAP2+: Drop legacy board file for n900")
from the arm-soc tree and commit:
9132ce450bd1 ("ARM: omap2: fix missing include")
from the gpio tree.
I fixed it up (the former removed the file, so I did that) 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 | Tony Lindgren <tony@atomide.com> |
|---|---|
| Date | 2016-09-27 21:20 +0200 |
| Message-ID | <sm653-526-9@gated-at.bofh.it> |
| In reply to | #1491686 |
* Stephen Rothwell <sfr@canb.auug.org.au> [160926 22:06]:
> Hi Linus,
>
> Today's linux-next merge of the gpio tree got a conflict in:
>
> arch/arm/mach-omap2/board-rx51-peripherals.c
>
> between commit:
>
> 9b7141d01a76 ("ARM: OMAP2+: Drop legacy board file for n900")
>
> from the arm-soc tree and commit:
>
> 9132ce450bd1 ("ARM: omap2: fix missing include")
>
> from the gpio tree.
>
> I fixed it up (the former removed the file, so I did that) 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.
Yes thanks removing it the way to go.
Regards,
Tony
[toc] | [prev] | [next] | [standalone]
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-10-06 00:50 +0200 |
| Message-ID | <sp3aF-8kc-11@gated-at.bofh.it> |
| In reply to | #1491686 |
Hi all,
On Tue, 27 Sep 2016 15:05:42 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the gpio tree got a conflict in:
>
> arch/arm/mach-omap2/board-rx51-peripherals.c
>
> between commit:
>
> 9b7141d01a76 ("ARM: OMAP2+: Drop legacy board file for n900")
>
> from the arm-soc tree and commit:
>
> 9132ce450bd1 ("ARM: omap2: fix missing include")
>
> from the gpio tree.
>
> I fixed it up (the former removed the file, so I did that) 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.
Since Linus (Torvalds) has merged the gpio tree, this conflict (and
file removal) now affects the merge of the arm-soc tree).
--
Cheers,
Stephen Rothwell
[toc] | [prev] | [next] | [standalone]
| From | Linus Walleij <linus.walleij@linaro.org> |
|---|---|
| Date | 2016-10-06 09:00 +0200 |
| Message-ID | <spaOR-4Wl-5@gated-at.bofh.it> |
| In reply to | #1496111 |
On Thu, Oct 6, 2016 at 12:41 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> On Tue, 27 Sep 2016 15:05:42 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the gpio tree got a conflict in:
>>
>> arch/arm/mach-omap2/board-rx51-peripherals.c
>>
>> between commit:
>>
>> 9b7141d01a76 ("ARM: OMAP2+: Drop legacy board file for n900")
>>
>> from the arm-soc tree and commit:
>>
>> 9132ce450bd1 ("ARM: omap2: fix missing include")
>>
>> from the gpio tree.
>>
>> I fixed it up (the former removed the file, so I did that) 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.
>
> Since Linus (Torvalds) has merged the gpio tree, this conflict (and
> file removal) now affects the merge of the arm-soc tree).
Yup and I also informed him in my pull request about this conflict
so shouldn't be a problem.
Yours,
Linus Walleij
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web