From: Tom <Tom.Rix@windriver.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] Zoom2 initial support rebased to arm/next
Date: Thu, 30 Apr 2009 15:25:11 -0500 [thread overview]
Message-ID: <49FA0927.7000307@windriver.com> (raw)
In-Reply-To: <49F9F2D8.4080005@googlemail.com>
Dirk Behme wrote:
> Hi Tom,
>
> Tom wrote:
>> Here is the changes to Zoom2 to rebase onto the arm/next branch
>
> I'm not sure and and didn't test it, but it seems to me that we might
> get some conflicts with patches in arm/master branch and these against
> arm/next.
>
> With Premi's patch that removes unused board-types
>
> http://git.denx.de/?p=u-boot/u-boot-arm.git;a=commit;h=90006e9b33bcdbf241b0295d186e3634137907a9
>
>
> it might conflict with your patch that still assumes the struct
> elements and macros are still there (?).
>
> Best regards
>
> Dirk
Yes, I think so.
My rebase to arm/next was because the arm led patch that was part of the
patch set against master was pushed there.
I think the changes in the above patch are straightforward so should be
easy to fix the conflicts when the merge happens.
Can this wait till after the whole patch set is pushed to arm/next ?
Tom
next prev parent reply other threads:[~2009-04-30 20:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-28 15:40 [U-Boot] Zoom2 initial support rebased to arm/next Tom
2009-04-30 18:50 ` Dirk Behme
2009-04-30 20:25 ` Tom [this message]
2009-05-01 6:40 ` Dirk Behme
2009-05-06 19:24 ` Dirk Behme
2009-05-07 14:19 ` Tom
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=49FA0927.7000307@windriver.com \
--to=tom.rix@windriver.com \
--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