In message 1215783017-27589-1-git-send-email-monstr@seznam.cz you wrote:
From: Michal Simek monstr@monstr.eu
there are some long lines in config file but this patches clean a lot of coding style issues
There could be small problem with Daniel name. Please check it in merge
Signed-off-by: Michal Simek monstr@monstr.eu
include/configs/sc520_spunk.h | 132 +++++++++++++++++++---------------------- 1 files changed, 62 insertions(+), 70 deletions(-)
diff --git a/include/configs/sc520_spunk.h b/include/configs/sc520_spunk.h index b7fa16e..bd6a599 100644 --- a/include/configs/sc520_spunk.h +++ b/include/configs/sc520_spunk.h @@ -1,6 +1,6 @@ /*
- (C) Copyright 2002
- Daniel Engström, Omicron Ceti AB, daniel@omicron.se.
- Daniel Engström, Omicron Ceti AB, daniel@omicron.se.
I fixed this problem with the 'ö', but the patch still doesn't apply:
error: patch failed: include/configs/sc520_spunk.h:86 error: include/configs/sc520_spunk.h: patch does not apply fatal: sha1 information is lacking or useless (include/configs/sc520_spunk.h). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001.
Please rebase and resubmit.
Best regards,
Wolfgang Denk