From: Tony Lindgren <tony@atomide.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arm-kernel@lists.infradead.org,
Thomas Gleixner <tglx@linutronix.de>,
linux-omap@vger.kernel.org, Nicolas Pitre <nico@fluxnic.net>
Subject: Re: [GIT PULL] omap board updates for v3.1 merge window
Date: Fri, 8 Jul 2011 01:30:42 -0700 [thread overview]
Message-ID: <20110708083042.GQ5783@atomide.com> (raw)
In-Reply-To: <201107072240.58987.arnd@arndb.de>
* Arnd Bergmann <arnd@arndb.de> [110707 13:36]:
> On Thursday 07 July 2011 18:29:11 Tony Lindgren wrote:
> > Please pull omap board updates from:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git devel-board
> >
> > These are currently on top of the fixes you pulled earlier but
> > could be also rebased on the earlier cleanup if you prefer that.
>
> I would generally prefer them to be independent, even if that causes
> minor conflicts. If some branches are built on top of others, that
> mainly means I have to remember the order in which to send them
> upstream, and my memory for these things is limited.
Sure. So let's wait on this one a bit. I'll send you some more cleanup
first as I just noticed that the TWL cleanup series will conflict with
these patches.
I need to base these board files on all the cleanup though, otherwise
things will get messy with merge and build conflicts.
Unfortunately there will be dependencies between branches until we
have the driver probe and bus (hwmod) code initializing things
using device tree data..
Regards,
Tony
next prev parent reply other threads:[~2011-07-08 8:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-07 16:29 [GIT PULL] omap board updates for v3.1 merge window Tony Lindgren
2011-07-07 20:40 ` Arnd Bergmann
2011-07-07 22:10 ` [PATCH] ARM: omap2: cm-t3730: convert boot_params to atag_offset Igor Grinberg
2011-07-08 8:30 ` Tony Lindgren [this message]
2011-07-08 8:54 ` [GIT PULL] omap board updates for v3.1 merge window Arnd Bergmann
2011-07-08 10:25 ` Tony Lindgren
2011-07-08 11:11 ` Arnd Bergmann
2011-07-08 11:33 ` Tony Lindgren
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=20110708083042.GQ5783@atomide.com \
--to=tony@atomide.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=nico@fluxnic.net \
--cc=tglx@linutronix.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