[U-Boot] [PATCH 1/2] net: Sort Makefile labels

Wolfgang Denk wd at denx.de
Sat Jan 24 02:02:02 CET 2009


Dear monstr at monstr.eu,

In message <d4fd46d3b2d27747b728da37fad3ebca3732d837.1231154122.git.monstr at monstr.eu> you wrote:
> From: Michal Simek <monstr at monstr.eu>
> 
> 
> Signed-off-by: Michal Simek <monstr at 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.


More information about the U-Boot mailing list