* [U-Boot] Conflict between mainline and ARM trees on davinci
@ 2013-03-11 9:38 Albert ARIBAUD
2013-03-11 20:03 ` Tom Rini
0 siblings, 1 reply; 2+ messages in thread
From: Albert ARIBAUD @ 2013-03-11 9:38 UTC (permalink / raw)
To: u-boot
Hello,
There is merge conflict between mainline and ARM trees on davinci gpio,
between
commit 03414ac45e119496e2475aeacbb968bb67da24f8
gpio: Build the da8xx_gpio code for the davinci644x device
(mainline)
and
commit b9f56698c7e9bf7ac773b5346c4f6886e214b69b
da8xx: Add the missing pinmux for da830 to the gpio driver
(ARM, from TI tree)
Authors CC:ed, as well as Tom for both TI and mainline tree.
Tom, how do you want to reconcile things?
Manual resolution in the merge commit was frowned upon last time I did
it, because it introduces non-reviewed code changes.
This leaves doing a manual commit on either one of the mainline, ARM or
TI trees so that merge becomes trivial. Mainline tree is preferable I
think, because it avoids added PR.
Amicalement,
--
Albert.
^ permalink raw reply [flat|nested] 2+ messages in thread
* [U-Boot] Conflict between mainline and ARM trees on davinci
2013-03-11 9:38 [U-Boot] Conflict between mainline and ARM trees on davinci Albert ARIBAUD
@ 2013-03-11 20:03 ` Tom Rini
0 siblings, 0 replies; 2+ messages in thread
From: Tom Rini @ 2013-03-11 20:03 UTC (permalink / raw)
To: u-boot
On Mon, Mar 11, 2013 at 10:38:21AM +0100, Albert ARIBAUD wrote:
> Hello,
>
> There is merge conflict between mainline and ARM trees on davinci gpio,
> between
>
> commit 03414ac45e119496e2475aeacbb968bb67da24f8
> gpio: Build the da8xx_gpio code for the davinci644x device
> (mainline)
>
> and
>
> commit b9f56698c7e9bf7ac773b5346c4f6886e214b69b
> da8xx: Add the missing pinmux for da830 to the gpio driver
> (ARM, from TI tree)
>
> Authors CC:ed, as well as Tom for both TI and mainline tree.
>
> Tom, how do you want to reconcile things?
>
> Manual resolution in the merge commit was frowned upon last time I did
> it, because it introduces non-reviewed code changes.
>
> This leaves doing a manual commit on either one of the mainline, ARM or
> TI trees so that merge becomes trivial. Mainline tree is preferable I
> think, because it avoids added PR.
This is addressed with the next u-boot-ti/master pull request where I
included the conflict resolution commit.
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130311/be1f6097/attachment-0001.pgp>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-03-11 20:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-11 9:38 [U-Boot] Conflict between mainline and ARM trees on davinci Albert ARIBAUD
2013-03-11 20:03 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.