linux-kernel - Re: linux-next: manual merge of the arm-soc tree with the arm-current tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Tue, 4 Sep 2012 23:19:55 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Arnd Bergmann <arnd@...db.de>
Cc:	Rob Herring <robherring2@...il.com>,
	"Russell King - ARM Linux" <linux@....linux.org.uk>,
	Olof Johansson <olof@...om.net>,
	linux-arm-kernel@...ts.infradead.org, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the arm-soc tree with the
 arm-current tree

On Tue, 4 Sep 2012 13:11:02 +0000 Arnd Bergmann <arnd@...db.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@...b.auug.org.au

Content of type "application/pgp-signature" skipped