From: Wolfgang Denk Date: Sat, 24 Jan 2009 02:02:02 +0100 Subject: [U-Boot] [PATCH 1/2] net: Sort Makefile labels In-Reply-To: References: <1231154714-15799-1-git-send-email-monstr@monstr.eu> Message-ID: <20090124010202.613EB832E425@gemini.denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Dear monstr at monstr.eu, In message you wrote: > From: Michal Simek > > > Signed-off-by: Michal Simek > --- > 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.