[U-Boot] [PATCH 4/4] dfu: Extract common DFU code to handle "dfu_alt_info" environment variable

[Lukasz Majewski]

On Wed, 11 Sep 2013 12:04:26 +0200 Marek Vasut marex at denx.de wrote,
> Dear Lukasz Majewski,
> 
> > Hi Marek,
> > 
> > > Dear Lukasz Majewski,
> > > 
> > > > New dfu_init_env_entities() function has been extracted from
> > > > cmd_dfu.c and stored at dfu core.
> > > > 
> > > > This is a dfu centric code, so it shall be processed in the
> > > > core.
> > > > 
> > > > Change-Id: I756c5de922fa31399d8804eaadc004ee98844ec2
> > > > Signed-off-by: Lukasz Majewski <l.majewski at samsung.com>
> > > 
> > > This does not apply for some reason, I applied 1/2 and 2/2 and
> > > pushed u-boot- usb/master
> > 
> > Marek, please test if it works for you:
> > 
> > 1. Fetch u-boot-denx-usb/master -> Patch 1 and 2 applied on top
> > 2. Use download mbox from patchwork:
> > http://patchwork.ozlabs.org/patch/273876/
> > 3. Apply the patch:
> > git am -3
> > U-Boot-4-4-dfu-Extract-common-DFU-code-to-handle-dfu_alt_info-environment-v
> > ariable.patch
> > 
> > I'm using git - version 1.7.10.4
> 
> No and it cannot:
> 
> $ git am 

I'm using git am -3 (three way merge).

Can you test it with it?

> /tmp/U-Boot-4-4-dfu-Extract-common-DFU-code-to-handle-dfu_alt_info-
> environment-variable.patch Applying: dfu: Extract common DFU code to
> handle "dfu_alt_info" environment
> variable error: patch failed:
> include/dfu.h:114 error: include/dfu.h: patch does not
> apply Patch failed at 0001 dfu: Extract common DFU code to handle
> "dfu_alt_info" environment
> variable When you have resolved this problem run "git am
> --resolved". If you would prefer to skip this patch, instead run "git
> am --skip". To restore the original branch and stop patching run "git
> am --abort".
> 
> Best regards,
> Marek Vasut


-- 
Best regards,

Lukasz Majewski

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