[U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation

[Wolfgang Denk]

Dear Reinhard Meyer,

In message <4CFBE49B.303 at emk-elektronik.de> you wrote:
>
> Sorry, the branch name might be a misnomer. As soon as I got two other patc=
> hes applied,
> I'll issue a pull request.

OK.
> 
> Maybe one of you can give me a hint how to fix the issue when a patch does
> not apply:
> 
> error: patch failed: boards.cfg:47
> error: boards.cfg: patch does not apply
> Patch failed at 0001.

First, try to figure out why this happen. If it's aproblem with the
patch, then consider rejecting it.  If you want to get it added, look
if it's line-wrapped or similar; usually this can be fixed with
reasonable efforts (assunimg it's a small and simple patch).

Try applying it using "patch -1 --dry-run".

Try applying it manually using your favorite editor.

> When you have resolved this problem run "git-am --resolved".
> If you would prefer to skip this patch, instead run "git-am --skip".
> reinhard at sieb:~/embedded/u-boot-atmel$ git status
> # On branch next-1
> # Untracked files:
> #   (use "git add <file>..." to include in what will be committed)
> #
> #       .dotest/
> nothing added to commit but untracked files present (use "git add" to track)

This is a rare case, then, wehre really nothing was applied.

> How do I resolve this? When there is a problem with git-rebase I get the of
> fending
> files merged with the conflicting parts between <<<,===,>>> respectiv
> ely. Easy to
> edit that. But with git-am I don't seem to get such an option?

You will get the same behaviour if at least parts of the patch could
be applied. In this case, it seems that nothing was applied at all.

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
You could end up being oddly sad and full of a strange, diffuse  com-
passion  which would lead you to believe that it might be a good idea
to wipe out the whole human race and start again with amoebas.
                                 - Terry Pratchett, _Guards! Guards!_