From mboxrd@z Thu Jan  1 00:00:00 1970
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Thu, 30 May 2013 19:37:48 +0200
Subject: [U-Boot] Conflict resolution for u-boot-arm/master and
 u-boot/master merge
In-Reply-To: <CAPnjgZ0OoSHYuLBCB7L8gAJr0RMQETd-tC-MA7BmFy=boDS4qQ@mail.gmail.com>
References: <20130530145541.7d6958de@lilith> <20130530182121.5fa449ba@lilith>
	<CAPnjgZ0OoSHYuLBCB7L8gAJr0RMQETd-tC-MA7BmFy=boDS4qQ@mail.gmail.com>
Message-ID: <20130530193748.37046c97@lilith>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

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.