From: Tom Rini <trini@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] Conflict resolution for u-boot-arm/master and u-boot/master merge
Date: Thu, 30 May 2013 09:03:08 -0400 [thread overview]
Message-ID: <51A74E0C.3080701@ti.com> (raw)
In-Reply-To: <20130530145541.7d6958de@lilith>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 05/30/2013 08:55 AM, Albert ARIBAUD wrote:
> Hello Tom and Bo,
>
> While preparing for my ARM PR, I have encountered two merge
> conflicts. Their resolution can be found in branch
> 'merge_from_mainline' of ARM repo git://git.denx.de/u-boot-arm.
>
> For common/cmd_fpga.c, the merge conflict was trivial -- Simon's
> renaming fit somehow caused a need for manual resolution just to
> select the version with the right name. Simon, can you confirm
> that my resolution is correct?
>
> For drivers/usb/host/ohci-at91.c, the conflicting commits are both
> from Bo, respectively 158947d2 (committed by Marek) and e5e8bb05
> (commited by Andreas). Bo, can you confirm that my resolution is
> correct?
>
> If both resolutions are correct, then at Tom's discretion, either
> I'll move my master there and submit what should then be a
> fast-forward PR, or I'll submit current master and Tom will replay
> my resolutions when doing his merge. Tom, your preference?
I'm OK with a fastforward, thanks.
- --
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQIcBAEBAgAGBQJRp04LAAoJENk4IS6UOR1WBtIP/RmA/DT/5ctxeQAf5Z87sPEC
bNp5hzRAcjuHmbaCWwEaPjgxuBjbsoAqvpwl+mPBvlzdd71ORQrR90pahH367Mtf
HthU0a9S5CIWNz92j16yqO1HKe6CyJKV3Zyu/g5jIjW4hPcddg173ZLJIbHIcZUg
86G8/A3lSHKBZa3ywYfft1O+AHHdB0lN4jvI8gV0TxBB4X411G5xqpYHV74ypt9y
gryH+WoeJxJK7jVLHZihZKHBLG7MAlJQXkGO+ughAmI2qRA2OMQuqVocYnwc88Kf
NEl7Sn+FcgoO3u+CQ5h97KqNo8i5jX68gbjX68+sLnkP0pT1ZfhhnyQLmoxaF2v7
HIgzuIJPpV8hfaexdZMAsRDNqTmLH++jKwjRIX0Q56I8faS3NgchzASOJOu4+6Ts
r8hED5gtSTmjpNwDHbzVlVafzevrp/46yXB68BeP/Dh0YqSxaj2v/0upuN98JSVZ
APJfkMIFF4CvSsCVmyekOljTRRKytsntJyVIMb6x0aVVPZvdkrj7mfHzdQel8egk
NE9zAwZ15PEmlgvntIyIoFc95s1TStgay+thUhk7NrvhMU6IyccXLk42tcQR92d6
LkkVNv3weWApp5nm9RIJZ47E3kl+Ijh2RtJ6P4OLek3KzjcrQv/PIQTTqLR4WAmX
9V2vIYVjkLWLU+8fBuwY
=Gc0L
-----END PGP SIGNATURE-----
next prev parent reply other threads:[~2013-05-30 13:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-30 12:55 [U-Boot] Conflict resolution for u-boot-arm/master and u-boot/master merge Albert ARIBAUD
2013-05-30 13:03 ` Tom Rini [this message]
2013-05-30 13:33 ` Bo Shen
2013-05-30 16:21 ` Albert ARIBAUD
2013-05-30 16:38 ` Simon Glass
2013-05-30 17:37 ` Albert ARIBAUD
2013-05-31 1:08 ` Simon Glass
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=51A74E0C.3080701@ti.com \
--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 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.