Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753067AbcD2JEU (ORCPT <rfc822;w@1wt.eu>);
	Fri, 29 Apr 2016 05:04:20 -0400
Received: from mail-wm0-f45.google.com ([74.125.82.45]:37209 "EHLO
	mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752477AbcD2JER (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 29 Apr 2016 05:04:17 -0400
Date: Fri, 29 Apr 2016 10:04:14 +0100
From: Matt Fleming <matt@codeblueprint.co.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Catalin Marinas <catalin.marinas@arm.com>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Ard Biesheuvel <ard.biesheuvel@linaro.org>,
        Arnd Bergmann <arnd@arndb.de>, Will Deacon <will.deacon@arm.com>
Subject: Re: linux-next: manual merge of the tip tree with the arm64 tree
Message-ID: <20160429090414.GC2839@codeblueprint.co.uk>
References: <20160429135645.20e288dd@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20160429135645.20e288dd@canb.auug.org.au>
User-Agent: Mutt/1.5.24+41 (02bc14ed1569) (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1349
Lines: 44

On Fri, 29 Apr, at 01:56:45PM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   drivers/firmware/efi/arm-init.c
> 
> between commits:
> 
>   500899c2cc3e ("efi: ARM/arm64: ignore DT memory nodes instead of removing them")
>   7464b6e3a5fb ("efi: ARM: avoid warning about phys_addr_t cast")
> 
> from the arm64 tree and commits:
> 
>   78ce248faa3c ("efi: Iterate over efi.memmap in for_each_efi_memory_desc()")
>   884f4f66ffd6 ("efi: Remove global 'memmap' EFI memory map")
> 
> from the tip tree.
 
[...]

> diff --cc drivers/firmware/efi/arm-init.c
> index fac567c3b66a,ef90f0c4b70a..000000000000
> --- a/drivers/firmware/efi/arm-init.c
> +++ b/drivers/firmware/efi/arm-init.c
> @@@ -143,15 -178,7 +178,15 @@@ static __init void reserve_regions(void
>   	if (efi_enabled(EFI_DBG))
>   		pr_info("Processing EFI memory map:\n");
>   
>  +	/*
>  +	 * Discard memblocks discovered so far: if there are any at this
>  +	 * point, they originate from memory nodes in the DT, and UEFI
>  +	 * uses its own memory map instead.
>  +	 */
>  +	memblock_dump_all();
>  +	memblock_remove(0, (phys_addr_t)ULLONG_MAX);
>  +
> - 	for_each_efi_memory_desc(&memmap, md) {
> + 	for_each_efi_memory_desc(md) {
>   		paddr = md->phys_addr;
>   		npages = md->num_pages;
>   

This looks fine, thanks Stephen.