From: Marek Vasut <marex@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 4/4] dfu: Extract common DFU code to handle "dfu_alt_info" environment variable
Date: Wed, 11 Sep 2013 12:04:26 +0200 [thread overview]
Message-ID: <201309111204.27063.marex@denx.de> (raw)
In-Reply-To: <20130911110947.2d83b396@amdc308.digital.local>
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@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 /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
next prev parent reply other threads:[~2013-09-11 10:04 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-10 13:29 [U-Boot] [PATCH 0/4] dfu: Various fixes and code optimizations Lukasz Majewski
2013-09-10 13:29 ` [U-Boot] [PATCH 1/4] dfu:cosmetic: Fix printf text for buffer overflow condition Lukasz Majewski
2013-09-11 4:38 ` Heiko Schocher
2013-09-10 13:29 ` [U-Boot] [PATCH 2/4] dfu: Make maximum DFU file size equal to default DFU data buffer Lukasz Majewski
2013-09-11 4:38 ` Heiko Schocher
2013-09-10 13:29 ` [U-Boot] [PATCH 3/4] dfu: Find DFU alt setting number by passing its name Lukasz Majewski
2013-09-10 14:32 ` Marek Vasut
2013-09-10 15:13 ` Lukasz Majewski
2013-09-10 21:20 ` Marek Vasut
2013-09-11 4:42 ` Heiko Schocher
2013-09-11 7:16 ` Lukasz Majewski
2013-09-10 13:29 ` [U-Boot] [PATCH 4/4] dfu: Extract common DFU code to handle "dfu_alt_info" environment variable Lukasz Majewski
2013-09-11 4:39 ` Heiko Schocher
2013-09-11 7:19 ` Marek Vasut
2013-09-11 9:09 ` Lukasz Majewski
2013-09-11 10:04 ` Marek Vasut [this message]
2013-09-11 11:30 ` Lukasz Majewski
2013-09-11 11:52 ` Marek Vasut
2013-09-11 12:53 ` [U-Boot] [PATCH 4/4 v2] " Lukasz Majewski
2013-09-12 10:37 ` Marek Vasut
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201309111204.27063.marex@denx.de \
--to=marex@denx.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.