From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marek Vasut <marex@denx.de>
Date: Tue, 10 Jun 2014 16:08:01 +0200
Subject: [U-Boot] [GIT] Pull request: u-boot-dfu
In-Reply-To: <20140610081001.1960ed88@amdc2363>
References: <20140526074627.335e11d2@amdc2363>
	<201406091932.00921.marex@denx.de>
	<20140610081001.1960ed88@amdc2363>
Message-ID: <201406101608.01894.marex@denx.de>
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

On Tuesday, June 10, 2014 at 08:10:01 AM, Lukasz Majewski wrote:
> Hi Marek,
> 
> > On Monday, June 09, 2014 at 12:51:43 PM, Lukasz Majewski wrote:
> > > Hi Marek,
> > > 
> > > > Hi Marek,
> > > > 
> > > > > On Monday, May 26, 2014 at 07:46:27 AM, Lukasz Majewski wrote:
> > > > > > Hi Marek
> > > > > > 
> > > > > > The following changes since commit
> > > > > > 
> > > > > > fc25fa27e5f439705e9ca42182014e2d75d9f0ae:
> > > > > >   dfu, nand: add medium specific polltimeout function
> > > > > > 
> > > > > > (2014-05-08 10:38:30 +0200)
> > > > > > 
> > > > > > are available in the git repository at:
> > > > > >   ssh://gu-dfu at git.denx.de/u-boot-dfu master
> > > > > > 
> > > > > > for you to fetch changes up to
> > > > > > 
> > > > > > 03bc75c206e25e8aeb8bbbb070b86424f7860453:
> > > > > >   dfu: Introduction of the "dfu_hash_algo" env variable for
> > > > > > 
> > > > > > checksum method setting (2014-05-26 07:31:54 +0200)
> > > > > > 
> > > > > > ----------------------------------------------------------------
> > > > > > 
> > > > > > Lukasz Majewski (1):
> > > > > >       dfu: Introduction of the "dfu_hash_algo" env variable
> > > > > > 
> > > > > > for
> > > > > > 
> > > > > > checksum method setting
> > > > > 
> > > > > I had merge conflict here, so I picked the one patch by hand.
> > > 
> > > I've made a little mistake. The v4 was merged indeed, however on the
> > > list we have agreed to merge v3. Rest of the mail is correct :-).
> > > 
> > > Sorry for confusion.
> > 
> > Please send me an incremental patch. I don't want to rewrite history,
> > so I will apply it on top of the current stuff.
> 
> Ok. Great :=)

Thanks!

Best regards,
Marek Vasut