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

From: Arnd Bergmann
Date: Tue Sep 04 2012 - 09:11:06 EST


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.

Arnd