On Fri, 13 Mar 2009 08:58:14 +0100
Norbert van Bolhuis <nvbolh...@aimvalley.nl> wrote:
> OK, no problem.
> Eventually I'll get it right :-)
> 3rd (and hopefully final) attempt:
something is still wrong with the way you are submitting this patch:
Applying: mpc83xx: correctly set encryption and I2C bus 0 clock
error: patch failed: cpu/mpc83xx/cpu_init.c:106
error: cpu/mpc83xx/cpu_init.c: patch does not apply
Using index info to reconstruct a base tree...
error: patch failed: cpu/mpc83xx/cpu_init.c:106
error: cpu/mpc83xx/cpu_init.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.
but since I'm out next week and this should go in now, I'm manually
applying it. Next time, try sending the patch to yourself and test if
you can apply it before sending it here. More information can be found
in linux-2.6/Documentation/{SubmittingPatches,email-clients.txt}.
Thanks for your contribution,
Kim
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
