[U-Boot] [GIT] Pull request: u-boot-dfu

[Lukasz Majewski <l.majewski@samsung.com>]

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.

> Unfortunately you took the v3 of the patch. As fair as I remember on
> the list we have agreed that we will use v4 of it.
> 
> You could replace the v3 patch which is still only on the u-boot-usb
> tree, or I will prepare a "diff" patch between v3 and v4. 
> 
> What do you prefer? 
> 
> > 
> > Thanks!
> > 
> > Best regards,
> > Marek Vasut
> 
> 
> 



-- 
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group