On Thu, 14 Feb 2008, Wolfgang Denk wrote: > In message <[EMAIL PROTECTED]> you wrote: > > Fix a missing return statement from a non-void function. > > > > Signed-off-by: Guennadi Liakhovetski <[EMAIL PROTECTED]> > > Applied, thanks. > > Ummm... I had to apply this manually: > > error: patch failed: common/cmd_mem.c:695 > error: common/cmd_mem.c: patch does not apply > fatal: sha1 information is lacking or useless (common/cmd_mem.c). > Repository lacks necessary blobs to fall back on 3-way merge. > Cannot fall back to three-way merge. > Patch failed at 0001. > > How old is your source tree?
I produced the patch against 1.2.0, but before that I've verified, that the file, or at least the affected function hasn't changed, so, thought it would be ok. Sorry. But what does the error message actually mean? Is it just because I referenced some "way too old" commit? Thanks Guennadi --- Guennadi Liakhovetski ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ U-Boot-Users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/u-boot-users
