[U-Boot-Users] [PATCH] Fix return value of mtest when CFG_ALT_MEMTEST set

[Guennadi Liakhovetski]

On Fri, 15 Feb 2008, Jon Loeliger wrote:

> Guennadi Liakhovetski wrote:
> > On Thu, 14 Feb 2008, Wolfgang Denk wrote:
> > 
> > > In message <Pine.LNX.4.64.0802131116340.5484 at axis700.grange> you wrote:
> > > > Fix a missing return statement from a non-void function.
> > > > 
> > > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
> > > 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?
> > 
> 
> No.  "Way too old" is not the issue with the error message.
> 
> First off, the patch didn't apply directly to the file.
> That's our key that the patch isn't up-to-date with the
> current tree, as that file has changed significantly enough
> that your changes are no longer applicable.

Ok, I think, I know the reason. Wolfgang, can it be, that you first tried 
to apply this patch, and only then my other patch

[PATCH v2] Fix wrong memory limit calculation in memory-test

which I sent 5 days earlier? Then there would be a conflict yes. Otherwise 
this specific function hasn't change since then. Probably, I should have 
specified a dependency on my previous patch, sorry.

Thanks
Guennadi
---
Guennadi Liakhovetski