From: Arnd Bergmann <arnd@arndb.de>
To: Tony Lindgren <tony@atomide.com>
Cc: linux-omap@vger.kernel.org, Russell King <linux@arm.linux.org.uk>,
Jon Medhurst <tixy@yxit.co.uk>,
linux-arm-kernel@lists.infradead.org,
Nicolas Pitre <nico@fluxnic.net>
Subject: Re: [GIT PULL] pending DT patches and cleanup for map_io for v3.2 merge window
Date: Mon, 31 Oct 2011 01:39:34 +0200 [thread overview]
Message-ID: <201110310039.34717.arnd@arndb.de> (raw)
In-Reply-To: <20111024091704.GF31337@atomide.com>
On Monday 24 October 2011, Tony Lindgren wrote:
> As discussed in the ARM kernel meeting yesterday, here's are
> the pending omap things to pull for v3.2 merge window.
Hi Tony,
I finally got to pull these.
> These would be nice to get still in as other people's work
> such as Nico's map_io changes need #2 below.
>
> 1. Initial DT support posted few weeks ago
>
> Please see the earlier pull request at:
>
> http://lkml.org/lkml/2011/10/4/441
Looks good. I've missed this initially because I had not yet managed
to go through that mail thread (randconfig patches) again and pick
up the patches that got an Ack. The pull request was right in the
middle of 100 other unread emails...
> 2. Cleanup for map_io posted few weeks ago
>
> This depends on the #1 above, and also requires
> the ioremap_exec patch. Russell said he has applied
> into devel-stable (But not pushed out yet?).
>
> When you have the ioremap_exec patch from Russell,
> please pull this from:
>
> git://github.com/tmlind/linux.git sram-map-io
>
> Pull request against #1 attached below.
This had systematic but trivial conflicts against the memory.h
series, which I fixed up. There was also a conflict with 009426a0e
"ARM: omap: Setup consistent dma size at boot time" from Tixy.
That patch added a call to omap_init_consistent_dma_size in a function
that you removed. I have resolved the conflict by adding that call to
omap1_init_early and omap_common_init_early, but I have no idea if that
is a correct resolution. Please check.
Arnd
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] pending DT patches and cleanup for map_io for v3.2 merge window
Date: Mon, 31 Oct 2011 01:39:34 +0200 [thread overview]
Message-ID: <201110310039.34717.arnd@arndb.de> (raw)
In-Reply-To: <20111024091704.GF31337@atomide.com>
On Monday 24 October 2011, Tony Lindgren wrote:
> As discussed in the ARM kernel meeting yesterday, here's are
> the pending omap things to pull for v3.2 merge window.
Hi Tony,
I finally got to pull these.
> These would be nice to get still in as other people's work
> such as Nico's map_io changes need #2 below.
>
> 1. Initial DT support posted few weeks ago
>
> Please see the earlier pull request at:
>
> http://lkml.org/lkml/2011/10/4/441
Looks good. I've missed this initially because I had not yet managed
to go through that mail thread (randconfig patches) again and pick
up the patches that got an Ack. The pull request was right in the
middle of 100 other unread emails...
> 2. Cleanup for map_io posted few weeks ago
>
> This depends on the #1 above, and also requires
> the ioremap_exec patch. Russell said he has applied
> into devel-stable (But not pushed out yet?).
>
> When you have the ioremap_exec patch from Russell,
> please pull this from:
>
> git://github.com/tmlind/linux.git sram-map-io
>
> Pull request against #1 attached below.
This had systematic but trivial conflicts against the memory.h
series, which I fixed up. There was also a conflict with 009426a0e
"ARM: omap: Setup consistent dma size at boot time" from Tixy.
That patch added a call to omap_init_consistent_dma_size in a function
that you removed. I have resolved the conflict by adding that call to
omap1_init_early and omap_common_init_early, but I have no idea if that
is a correct resolution. Please check.
Arnd
Arnd
next prev parent reply other threads:[~2011-10-30 23:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-24 9:17 [GIT PULL] pending DT patches and cleanup for map_io for v3.2 merge window Tony Lindgren
2011-10-24 9:17 ` Tony Lindgren
2011-10-28 9:39 ` Tony Lindgren
2011-10-28 9:39 ` Tony Lindgren
2011-10-28 10:09 ` Russell King - ARM Linux
2011-10-28 10:09 ` Russell King - ARM Linux
2011-10-30 23:39 ` Arnd Bergmann [this message]
2011-10-30 23:39 ` Arnd Bergmann
2011-11-01 17:00 ` Tony Lindgren
2011-11-01 17:00 ` 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=201110310039.34717.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=nico@fluxnic.net \
--cc=tixy@yxit.co.uk \
--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.