From: Tom Rini <trini@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] Conflict between mainline and ARM trees on davinci
Date: Mon, 11 Mar 2013 16:03:08 -0400 [thread overview]
Message-ID: <20130311200308.GC23324@bill-the-cat> (raw)
In-Reply-To: <20130311103821.206f8faf@lilith>
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>
prev parent reply other threads:[~2013-03-11 20:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130311200308.GC23324@bill-the-cat \
--to=trini@ti.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox