From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] ux500-core for ARM SoC
Date: Wed, 2 May 2012 15:40:47 +0000 [thread overview]
Message-ID: <201205021540.48113.arnd@arndb.de> (raw)
In-Reply-To: <CACRpkdY92StLhPv4kpopf8JpU1+PtjrgrdFWdvP4F3fwp1-_Gg@mail.gmail.com>
On Wednesday 02 May 2012, Linus Walleij wrote:
>
> On Mon, Apr 30, 2012 at 11:41 PM, Arnd Bergmann <arnd@arndb.de> wrote:
>
> > Please separate this into more logical branches, e.g.
> >
> > 1. delete u5500
> > 2. add u9540 support
>
> The U9540 stuff was used as a base so when deleting U5500 and
> this code is in close hamming-proximity so you will get
> a lot of conflicts.
Ok, I saw them. I think they are fine, but if they get too annoying,
I will resolve the conflict myself before sending it upstream.
I was mostly worried about the order of stuff, because we are removing
the ixp2xxx socs in the cleanup branch already, which I want to send
early on, so I probably woundn't have complained if you had them in
the opposite order in your branch (removal first, then new stuff) so
I could just have put the last cleanup commit into a branch by itself
and let the other one be based on that.
Anyway, separate pulls are best, so I'm happy now and have applied
pulled your four branches into next/cleanup, next/newsoc, next/dt and
next/cpuidle respectively.
Thanks a lot!
Arnd
prev parent reply other threads:[~2012-05-02 15:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-25 15:50 [GIT PULL] ux500-core for ARM SoC Linus Walleij
2012-04-30 21:41 ` Arnd Bergmann
2012-05-02 10:23 ` Linus Walleij
2012-05-02 15:40 ` Arnd Bergmann [this message]
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=201205021540.48113.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.