[U-Boot] Conflict resolution for u-boot-arm/master and u-boot/master merge
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?
Thanks in advance to all!
Amicalement,
-----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
Bo Shen voice.shen@gmail.com on behalf of Bo Shen voice.shen@atmel.com
Hi Albert,
On 05/30/2013 08:55 PM, 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?
Confirmed, the resolution is correct. Thanks.
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?
Thanks in advance to all!
Amicalement,
Best Regards, Bo Shen
On Thu, 30 May 2013 14:55:41 +0200, Albert ARIBAUD albert.u.boot@aribaud.net 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?
... actually adding Simon as To:...
Amicalement,
Hi Albert,
On Thu, May 30, 2013 at 9:21 AM, Albert ARIBAUD albert.u.boot@aribaud.netwrote:
On Thu, 30 May 2013 14:55:41 +0200, Albert ARIBAUD albert.u.boot@aribaud.net 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?
... actually adding Simon as To:...
Yes this looks right thanks.
Although I do wonder if you mean that I renamed 'fit', or I had a renaming fit.
Regards, Simon
Hi Simon,
On Thu, 30 May 2013 09:38:56 -0700, Simon Glass sjg@chromium.org wrote:
Hi Albert,
On Thu, May 30, 2013 at 9:21 AM, Albert ARIBAUD albert.u.boot@aribaud.netwrote:
On Thu, 30 May 2013 14:55:41 +0200, Albert ARIBAUD albert.u.boot@aribaud.net 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?
... actually adding Simon as To:...
Yes this looks right thanks.
Thanks for your confirmation.
Although I do wonder if you mean that I renamed 'fit', or I had a renaming fit.
Phew! I was wondering if that one had gone below everyone's radars. :)
Regards, Simon
Amicalement,
Hi Albert,
On Thu, May 30, 2013 at 10:37 AM, Albert ARIBAUD albert.u.boot@aribaud.netwrote:
Hi Simon,
On Thu, 30 May 2013 09:38:56 -0700, Simon Glass sjg@chromium.org wrote:
Hi Albert,
On Thu, May 30, 2013 at 9:21 AM, Albert ARIBAUD albert.u.boot@aribaud.netwrote:
On Thu, 30 May 2013 14:55:41 +0200, Albert ARIBAUD albert.u.boot@aribaud.net 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?
... actually adding Simon as To:...
Yes this looks right thanks.
Thanks for your confirmation.
Although I do wonder if you mean that I renamed 'fit', or I had a
renaming
fit.
Phew! I was wondering if that one had gone below everyone's radars. :)
If you recall I had a renaming fit with bss_end, this was just a tic.
Regards, Simon
participants (4)
-
Albert ARIBAUD -
Bo Shen -
Simon Glass -
Tom Rini