Skip to content

get at91rm9200ek working with ARM relocation

Reinhard Meyer u-boot 5 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest posting 5/50 of 4 patches 0 repliesNew
  2. v2 posting 4/50 of 4 patches 0 repliesSuperseded
  3. v2 posting 3/50 of 4 patches 0 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v2 posting 2/50 of 4 patches0 repliesSuperseded
v2 posting 1/50 of 4 patches0 repliesSuperseded

Patches in v2 posting 5/5 No applies recorded yet

None of the 4 patches the cover letter announces are in this archive.

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

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

Dear Wolfgang Denk,

Quoted 5 lines
Quoted 2 lines · In message<[email protected]> you wrote:

What's possible in git-rebase should be possible in git-am, too.

git-rebase will also show merge conflicts in such cases.

I'm not not what you are trying to say here, since I stated that I wished git-am would behave the same way as git-rebase.

Anyway, I solved the problem:

git-am -3 <patch>
when this fails, do
git-am -3 --skip
edit the unmerged files
add them
git-am -3 --resolved
and all is fine.

Best Regards,
Reinhard