From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751612AbbLPFBq (ORCPT ); Wed, 16 Dec 2015 00:01:46 -0500 Received: from ozlabs.org ([103.22.144.67]:50653 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750713AbbLPFBo (ORCPT ); Wed, 16 Dec 2015 00:01:44 -0500 Date: Wed, 16 Dec 2015 16:01:43 +1100 From: Stephen Rothwell To: Andrew Morton , Catalin Marinas Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ard Biesheuvel , Will Deacon , Yaowei Bai Subject: linux-next: manual merge of the akpm-current tree with the arm64 tree Message-ID: <20151216160143.5d1a8d1e@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/memblock.h between commit: bf3d3cc580f9 ("mm/memblock: add MEMBLOCK_NOMAP attribute to memblock memory table") from the arm64 tree and commit: f7e2bc7d46e9 ("mm/memblock.c: memblock_is_memory()/reserved() can be boolean") from the akpm-current tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc include/linux/memblock.h index fec66f86eeff,359871f2fedd..000000000000 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@@ -325,10 -318,9 +325,10 @@@ phys_addr_t memblock_mem_size(unsigned phys_addr_t memblock_start_of_DRAM(void); phys_addr_t memblock_end_of_DRAM(void); void memblock_enforce_memory_limit(phys_addr_t memory_limit); - int memblock_is_memory(phys_addr_t addr); + bool memblock_is_memory(phys_addr_t addr); +int memblock_is_map_memory(phys_addr_t addr); int memblock_is_region_memory(phys_addr_t base, phys_addr_t size); - int memblock_is_reserved(phys_addr_t addr); + bool memblock_is_reserved(phys_addr_t addr); bool memblock_is_region_reserved(phys_addr_t base, phys_addr_t size); extern void __memblock_dump_all(void);