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

> Hi Simon,
>
> On Thu, 30 May 2013 09:38:56 -0700, Simon Glass <sjg at chromium.org>
> wrote:
>
> > Hi Albert,
> >
> > On Thu, May 30, 2013 at 9:21 AM, Albert ARIBAUD
> > <albert.u.boot at aribaud.net>wrote:
> >
> > > On Thu, 30 May 2013 14:55:41 +0200, Albert ARIBAUD
> > > <albert.u.boot at 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