From mboxrd@z Thu Jan 1 00:00:00 1970 From: Reinhard Meyer Date: Sun, 05 Dec 2010 20:14:35 +0100 Subject: [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation In-Reply-To: <90F3B181-8AA6-438C-855C-A78824261760@googlemail.com> References: <1291146306-15103-1-git-send-email-andreas.devel@googlemail.com> <4CFB6107.9060000@emk-elektronik.de> <4CFBD250.1050502@aribaud.net> <90F3B181-8AA6-438C-855C-A78824261760@googlemail.com> Message-ID: <4CFBE49B.303@emk-elektronik.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 05.12.2010 19:05, Andreas Bie?mann wrote: > Dear Albert, dear Reinhard, > > Am 05.12.2010 um 18:56 schrieb Albert ARIBAUD: > >> Le 05/12/2010 18:43, Andreas Bie?mann a ?crit : >>> Dear Reinhard Meyer, >>> >>> Am 05.12.2010 um 10:53 schrieb Reinhard Meyer: >>> >>> [snip summary for 'get at91rm9200ek working with ARM relocation'] >>> >>>> Applied all four to u-boot-atmel/next. >>> >>> I assume these do not go into v2010.12, is that correct? >> >> I would have thought they did, in order to get more boards working in 2010.12. > > I'm just asking cause of the next branch ... I would prefer to have them in v2010.12 Sorry, the branch name might be a misnomer. As soon as I got two other patches applied, I'll issue a pull request. 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. 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 ..." to include in what will be committed) # # .dotest/ nothing added to commit but untracked files present (use "git add" to track) How do I resolve this? When there is a problem with git-rebase I get the offending files merged with the conflicting parts between <<<,===,>>> respectively. Easy to edit that. But with git-am I don't seem to get such an option? Best Regards, Reinhard