public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Wolfgang Denk <wd@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] ARM pull request v2
Date: Tue, 13 Oct 2009 12:11:15 +0200	[thread overview]
Message-ID: <20091013101115.C4BA9E84EB4@gemini.denx.de> (raw)
In-Reply-To: <4AD44BDE.80400@bumblecow.com>

Dear Tom,

In message <4AD44BDE.80400@bumblecow.com> you wrote:
>
> > I tried pulling your repo in a temp branch and rebase this, but this
> > caused a lots of merge conflicts in non-ARM files.
> > 
> > Can you please try to clean this up? Maybe we can split this in a list
> > of ARM related commits that can be cherry-picked?
>
> Yes I see that that merge conflict.
> I will clean this up to a new branch by cherry-picking.
> This may take a day or two to do and to verify.
> I will have it done asap.

Thanks a lot.

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
"One planet is all you get."

  reply	other threads:[~2009-10-13 10:11 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-13  2:25 [U-Boot] ARM pull request v2 Tom
2009-10-13  8:37 ` Wolfgang Denk
2009-10-13  9:43   ` Tom Rix
2009-10-13 10:11     ` Wolfgang Denk [this message]
  -- strict thread matches above, loose matches on Subject: below --
2009-10-13  2:26 Tom Rix

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20091013101115.C4BA9E84EB4@gemini.denx.de \
    --to=wd@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox