Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1626848 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2017-04-20 00:40 +0200 |
| Last post | 2017-04-20 17:00 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the at91 tree with the arm-soc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-20 00:40 +0200
RE: linux-next: manual merge of the at91 tree with the arm-soc tree <Nicolas.Ferre@microchip.com> - 2017-04-20 17:00 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2017-04-20 00:40 +0200 |
| Subject | linux-next: manual merge of the at91 tree with the arm-soc tree |
| Message-ID | <ty6qu-Hv-17@gated-at.bofh.it> |
Hi Nicolas,
Today's linux-next merge of the at91 tree got a conflict in:
arch/arm/boot/dts/at91-tse850-3.dts
between commit:
e67cedc92812 ("ARM: dts: at91: add envelope detector mux to the Axentia TSE-850")
from the arm-soc tree and commit:
29dd89418007 ("ARM: dts: at91: add envelope detector mux to the Axentia TSE-850")
from the at91 tree.
I fixed it up (I used the arm-soc tree version) 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 | <Nicolas.Ferre@microchip.com> |
|---|---|
| Date | 2017-04-20 17:00 +0200 |
| Message-ID | <tylIS-1Nt-29@gated-at.bofh.it> |
| In reply to | #1626848 |
> Hi Nicolas,
>
> Today's linux-next merge of the at91 tree got a conflict in:
>
> arch/arm/boot/dts/at91-tse850-3.dts
> between commit:
>
> e67cedc92812 ("ARM: dts: at91: add envelope detector mux to the Axentia TSE-850")
>
> from the arm-soc tree and commit:
>
> 29dd89418007 ("ARM: dts: at91: add envelope detector mux to the Axentia TSE-850")
>
> from the at91 tree.
>
> I fixed it up (I used the arm-soc tree version) 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.
Stephen,
Yes, the use of arm-soc version was the way to go. I now have updated my at91-next tree to match Alexandre's pull-request and hope it is not in conflict anymore.
Thanks for your fix.
Best regards,
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web