From: Arnd Bergmann <arnd@arndb.de>
To: linux-arm-kernel@lists.infradead.org
Cc: Tony Lindgren <tony@atomide.com>,
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: Thu, 7 Jul 2011 22:40:58 +0200 [thread overview]
Message-ID: <201107072240.58987.arnd@arndb.de> (raw)
In-Reply-To: <20110707162911.GL5783@atomide.com>
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.
> Please note that the board-cm-t35.c change will need a minor fix
> when merging with the atag_offset patch series. In MACHINE_START
> the .boot_params needs to be replaced with .atag_offset = 0x100.
>
> Also note that this series is missing the Nook Color board
> support as that one is waiting on the machine_id patch.
Ok
Thanks,
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] omap board updates for v3.1 merge window
Date: Thu, 7 Jul 2011 22:40:58 +0200 [thread overview]
Message-ID: <201107072240.58987.arnd@arndb.de> (raw)
In-Reply-To: <20110707162911.GL5783@atomide.com>
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.
> Please note that the board-cm-t35.c change will need a minor fix
> when merging with the atag_offset patch series. In MACHINE_START
> the .boot_params needs to be replaced with .atag_offset = 0x100.
>
> Also note that this series is missing the Nook Color board
> support as that one is waiting on the machine_id patch.
Ok
Thanks,
Arnd
next prev parent reply other threads:[~2011-07-07 20:41 UTC|newest]
Thread overview: 16+ 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 16:29 ` Tony Lindgren
2011-07-07 20:40 ` Arnd Bergmann [this message]
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-07 22:10 ` Igor Grinberg
2011-07-08 8:30 ` [GIT PULL] omap board updates for v3.1 merge window Tony Lindgren
2011-07-08 8:30 ` Tony Lindgren
2011-07-08 8:54 ` Arnd Bergmann
2011-07-08 8:54 ` Arnd Bergmann
2011-07-08 10:25 ` Tony Lindgren
2011-07-08 10:25 ` Tony Lindgren
2011-07-08 11:11 ` Arnd Bergmann
2011-07-08 11:11 ` Arnd Bergmann
2011-07-08 11:33 ` Tony Lindgren
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=201107072240.58987.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=nico@fluxnic.net \
--cc=tglx@linutronix.de \
--cc=tony@atomide.com \
/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.