Dear Graeme Russ,
In message 1228606151-10839-11-git-send-email-graeme.russ@gmail.com you wrote:
Options are now all uniformly CONFIG_SYS_SC520_<option>
Signed-off-by: Graeme Russ graeme.russ@gmail.com
board/sc520_cdp/sc520_cdp.c | 16 ++++++++-------- cpu/i386/sc520/Makefile | 4 ++-- cpu/i386/sc520/sc520.c | 6 +++--- cpu/i386/sc520/sc520_asm.S | 4 ++-- include/configs/eNET.h | 6 +++--- include/configs/sc520_cdp.h | 10 +++++----- include/configs/sc520_spunk.h | 6 +++--- 7 files changed, 26 insertions(+), 26 deletions(-)
Here your patch series finally broke down:
-> git-am -3 -i -u --whitespace=strip ~/Mail/U-Boot/5146 Commit Body is: -------------------------- Renamed SC520 configuration options
Options are now all uniformly CONFIG_SYS_SC520_<option>
Signed-off-by: Graeme Russ graeme.russ@gmail.com -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Renamed SC520 configuration options error: cpu/i386/sc520/Makefile: does not exist in index error: cpu/i386/sc520/sc520.c: does not exist in index error: cpu/i386/sc520/sc520_asm.S: does not exist in index fatal: sha1 information is lacking or useless (cpu/i386/sc520/Makefile). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001. When you have resolved this problem run "git am -i -3 --resolved". If you would prefer to skip this patch, instead run "git am -i -3 --skip". To restore the original branch and stop patching run "git am -i -3 --abort".
Please check the current code as is in mainline now, and repost cleaned up patches starting with the current one, i. e. [PATCH 10/15] and higher.
Thanks.
Best regards,
Wolfgang Denk