[U-Boot] Conflict resolution for u-boot-arm/master and u-boot/master merge

[U-Boot] Conflict resolution for u-boot-arm/master and u-boot/master merge

[Albert ARIBAUD]

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,
-- 
Albert.

[U-Boot] Conflict resolution for u-boot-arm/master and u-boot/master merge

[Tom Rini]

-----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-----

[U-Boot] Conflict resolution for u-boot-arm/master and u-boot/master merge

[Bo Shen]

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

[U-Boot] Conflict resolution for u-boot-arm/master and u-boot/master merge

[Albert ARIBAUD]

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,
-- 
Albert.

[U-Boot] Conflict resolution for u-boot-arm/master and u-boot/master merge

[Simon Glass]

Hi Albert,

On Thu, May 30, 2013 at 9:21 AM, Albert ARIBAUD
<albert.u.boot@aribaud.net>wrote:

> 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

[U-Boot] Conflict resolution for u-boot-arm/master and u-boot/master merge

[Albert ARIBAUD]

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.net>wrote:
> 
> > 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,
-- 
Albert.

[U-Boot] Conflict resolution for u-boot-arm/master and u-boot/master merge

[Simon Glass]

Hi Albert,

On Thu, May 30, 2013 at 10:37 AM, Albert ARIBAUD
<albert.u.boot@aribaud.net>wrote:

> 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.net>wrote:
> >
> > > 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