linux-next: manual merge of the arm-current tree with Linus' tree

[Stephen Rothwell]

Hi Russell,

Today's linux-next merge of the arm-current tree got a conflict in
arch/arm/mm/init.c between commit dbe67df4ba78 ("mm: enhance
free_reserved_area() to support poisoning memory with zero") from Linus'
tree and commit 319e0b4f02f7 ("ARM: mm: fix boot on SA1110 Assabet") from
the arm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mm/init.c
index 6833cbe,0ecc43f..0000000
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@@ -597,7 -600,7 +597,7 @@@ void __init mem_init(void
  
  #ifdef CONFIG_SA1111
  	/* now that our DMA memory is actually so designated, we can free it */
- 	free_reserved_area(__va(PHYS_PFN_OFFSET), swapper_pg_dir, -1, NULL);
 -	free_reserved_area(__va(PHYS_OFFSET), swapper_pg_dir, 0, NULL);
++	free_reserved_area(__va(PHYS_OFFSET), swapper_pg_dir, -1, NULL);
  #endif
  
  	free_highpages();

Attachment: pgp00000.pgp
Description: PGP signature