From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Rob Herring <robherring2@gmail.com>,
"Russell King - ARM Linux" <linux@arm.linux.org.uk>,
Olof Johansson <olof@lixom.net>,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the arm-soc tree with the arm-current tree
Date: Tue, 4 Sep 2012 23:19:55 +1000 [thread overview]
Message-ID: <20120904231955.fb82c1b44e7c4568f626c915@canb.auug.org.au> (raw)
In-Reply-To: <201209041311.02222.arnd@arndb.de>
[-- Attachment #1: Type: text/plain, Size: 710 bytes --]
On Tue, 4 Sep 2012 13:11:02 +0000 Arnd Bergmann <arnd@arndb.de> wrote:
>
> On Tuesday 04 September 2012, Rob Herring wrote:
> > Right. The PCI i/o reserved area has a dummy physical address of 0 and
> > needs to be skipped by ioremap searches. So we don't set
> > VM_ARM_STATIC_MAPPING to prevent matches by ioremap. The vm_struct settings
> > don't really matter when we do the real mapping of the i/o space.
> >
> > Here's my merge:
>
> Ok, thanks for the clarification. I've merged Russell's fixes branch
> into the cleanup/io-pci branch now to resolve the conflict.
Even better than me handling it. Thanks guys.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-09-04 13:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-04 6:06 linux-next: manual merge of the arm-soc tree with the arm-current tree Stephen Rothwell
2012-09-04 8:08 ` Arnd Bergmann
2012-09-04 9:01 ` Russell King - ARM Linux
2012-09-04 12:44 ` Rob Herring
2012-09-04 13:03 ` Stephen Rothwell
2012-09-04 13:11 ` Arnd Bergmann
2012-09-04 13:19 ` Stephen Rothwell [this message]
2013-04-11 6:21 Stephen Rothwell
2015-01-29 22:58 Stephen Rothwell
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=20120904231955.fb82c1b44e7c4568f626c915@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=olof@lixom.net \
--cc=robherring2@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).