linux-next: manual merge of the akpm tree with the tip tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the akpm tree got a conflict in:

  arch/x86/platform/efi/efi_64.c

between commit:

  1f299fad1e31 ("efi/x86: Limit EFI old memory map to SGI UV machines")

from the tip tree and patch:

  "x86: mm+efi: convert ptdump_walk_pgd_level() to take a mm_struct"

from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/x86/platform/efi/efi_64.c
index e2accfe636bd,515eab388b56..000000000000
--- a/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
@@@ -470,10 -606,10 +470,10 @@@ void __init efi_runtime_update_mappings
  void __init efi_dump_pagetable(void)
  {
  #ifdef CONFIG_EFI_PGT_DUMP
 -	if (efi_enabled(EFI_OLD_MEMMAP))
 +	if (efi_have_uv1_memmap())
- 		ptdump_walk_pgd_level(NULL, swapper_pg_dir);
+ 		ptdump_walk_pgd_level(NULL, &init_mm);
  	else
- 		ptdump_walk_pgd_level(NULL, efi_mm.pgd);
+ 		ptdump_walk_pgd_level(NULL, &efi_mm);
  #endif
  }

Attachment: pgpPYSTW7TN3_.pgp
Description: OpenPGP digital signature