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