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

2012-09-04 Thread Stephen Rothwell
On Tue, 4 Sep 2012 13:11:02 + Arnd Bergmann 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 iore

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

2012-09-04 Thread Arnd Bergmann
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 r

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

2012-09-04 Thread Stephen Rothwell
Hi Rob, On Tue, 04 Sep 2012 07:44:16 -0500 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

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

2012-09-04 Thread Rob Herring
On 09/04/2012 04:01 AM, Russell King - ARM Linux wrote: > On Tue, Sep 04, 2012 at 08:08:24AM +, Arnd Bergmann wrote: >> On Tuesday 04 September 2012, Stephen Rothwell wrote: >>> Today's linux-next merge of the arm-soc tree got a conflict in >>> arch/arm/mm/mmu.c between commit a849088aa155 ("AR

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

2012-09-04 Thread Russell King - ARM Linux
On Tue, Sep 04, 2012 at 08:08:24AM +, Arnd Bergmann wrote: > On Tuesday 04 September 2012, Stephen Rothwell wrote: > > Today's linux-next merge of the arm-soc tree got a conflict in > > arch/arm/mm/mmu.c between commit a849088aa155 ("ARM: Fix ioremap() of > > address zero") from the arm-current

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

2012-09-04 Thread Arnd Bergmann
On Tuesday 04 September 2012, Stephen Rothwell wrote: > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/mm/mmu.c between commit a849088aa155 ("ARM: Fix ioremap() of > address zero") from the arm-current tree and commit c2794437091a ("ARM: > Add fixed PCI i/o mapping") from