From: Wolfgang Denk <wd@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/2] net: Sort Makefile labels
Date: Sat, 24 Jan 2009 02:02:02 +0100 [thread overview]
Message-ID: <20090124010202.613EB832E425@gemini.denx.de> (raw)
In-Reply-To: <d4fd46d3b2d27747b728da37fad3ebca3732d837.1231154122.git.monstr@monstr.eu>
Dear monstr at monstr.eu,
In message <d4fd46d3b2d27747b728da37fad3ebca3732d837.1231154122.git.monstr@monstr.eu> you wrote:
> From: Michal Simek <monstr@monstr.eu>
>
>
> Signed-off-by: Michal Simek <monstr@monstr.eu>
> ---
> drivers/net/Makefile | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
Sorry, this doesn't apply either:
Applying: part_efi: Fix partition size calculation due to inclusive ending LBA.
error: patch failed: disk/part_efi.c:163
error: disk/part_efi.c: patch does not apply
Using index info to reconstruct a base tree...
error: patch failed: disk/part_efi.c:163
error: disk/part_efi.c: patch does not apply
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Cannot fall back to three-way merge.
Patch failed at 0001.
Please rebase and repost. Thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
There are two ways to write error-free programs. Only the third one
works.
next prev parent reply other threads:[~2009-01-24 1:02 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-05 11:25 [U-Boot] Xilinx LL-TEMAC driver monstr at monstr.eu
2009-01-05 11:25 ` [U-Boot] [PATCH 1/2] net: Sort Makefile labels monstr at monstr.eu
2009-01-05 11:25 ` [U-Boot] [PATCH 2/2] net: Add Xilinx LL Temac driver monstr at monstr.eu
2009-01-26 8:12 ` Michal Simek
2009-01-29 8:15 ` Michal Simek
2009-04-03 21:35 ` Wolfgang Denk
2009-04-06 14:17 ` Michal Simek
2009-01-29 7:09 ` Ben Warren
2009-01-24 1:00 ` [U-Boot] [PATCH 1/2] net: Sort Makefile labels Wolfgang Denk
2009-01-24 1:02 ` Wolfgang Denk [this message]
2009-01-29 8:17 ` Ben Warren
2009-02-09 20:09 ` Wolfgang Denk
2009-02-09 22:03 ` Ben Warren
2009-02-10 8:15 ` Michal Simek
2009-02-10 8:39 ` Stefan Roese
2009-02-10 8:54 ` Wolfgang Denk
2009-02-10 9:09 ` Michal Simek
2009-02-10 15:16 ` Ben Warren
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=20090124010202.613EB832E425@gemini.denx.de \
--to=wd@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox