[U-Boot] [PATCH v2 08/20] ppc: Move cpu/$CPU to arch/ppc/cpu/$CPU

Wolfgang Denk wd at denx.de
Sun Apr 11 00:11:04 CEST 2010


Dear Peter Tyser,

In message <1270438450-26675-9-git-send-email-ptyser at xes-inc.com> you wrote:
> Signed-off-by: Peter Tyser <ptyser at xes-inc.com>

Patch series does not apply.

First deviations visible here:

	Applying: Replace "#include <asm-$ARCH/$FILE>" with "#include <asm/$FILE>"
	Using index info to reconstruct a base tree...
	Falling back to patching base and 3-way merge...

But this still succeeds.  Then:

	Applying: ppc: Move cpu/$CPU to arch/ppc/cpu/$CPU
	fatal: sha1 information is lacking or useless (Makefile).
	Repository lacks necessary blobs to fall back on 3-way merge.
	Cannot fall back to three-way merge.
	Patch failed at 0008 ppc: Move cpu/$CPU to arch/ppc/cpu/$CPU


Can you please check what's wrong?

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
A rolling stone gathers momentum.


More information about the U-Boot mailing list