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

[Stephen Rothwell]

Hi all,

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 the arm-soc tree.

I am not sure how to fix this, so I have used the arm-current version of
the change to pmd_empty_section_gap() since that changed the vm->flags.
It may be that just changing the vm->flags value in vm_reserve_area_early()
would be ok?
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature