From: Albert ARIBAUD <albert.u.boot@aribaud.net>
To: u-boot@lists.denx.de
Subject: [U-Boot] Conflict between mainline and ARM trees on davinci
Date: Mon, 11 Mar 2013 10:38:21 +0100 [thread overview]
Message-ID: <20130311103821.206f8faf@lilith> (raw)
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.
next reply other threads:[~2013-03-11 9:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-11 9:38 Albert ARIBAUD [this message]
2013-03-11 20:03 ` [U-Boot] Conflict between mainline and ARM trees on davinci Tom Rini
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=20130311103821.206f8faf@lilith \
--to=albert.u.boot@aribaud.net \
--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