linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
	Catalin Marinas <catalin.marinas@arm.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Ard Biesheuvel <ard.biesheuvel@linaro.org>,
	Will Deacon <will.deacon@arm.com>,
	Yaowei Bai <baiyaowei@cmss.chinamobile.com>
Subject: linux-next: manual merge of the akpm-current tree with the arm64 tree
Date: Wed, 16 Dec 2015 16:01:43 +1100	[thread overview]
Message-ID: <20151216160143.5d1a8d1e@canb.auug.org.au> (raw)

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);

             reply	other threads:[~2015-12-16  5:01 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-16  5:01 Stephen Rothwell [this message]
2015-12-16 10:14 ` linux-next: manual merge of the akpm-current tree with the arm64 tree Will Deacon
  -- strict thread matches above, loose matches on Subject: below --
2021-10-08  6:04 Stephen Rothwell
2021-10-08  7:37 ` Will Deacon
2021-04-13  8:59 Stephen Rothwell
2021-04-13  9:14 ` Catalin Marinas
2020-12-03  8:06 Stephen Rothwell
2020-12-03 11:16 ` Catalin Marinas
2020-09-21  8:03 Stephen Rothwell
2020-09-21  8:12 ` Catalin Marinas
2020-10-13  7:34 ` Stephen Rothwell
2020-07-16  8:00 Stephen Rothwell
2020-07-16  8:23 ` Will Deacon
2020-04-30  6:26 Stephen Rothwell
2020-04-29  6:53 Stephen Rothwell
2019-08-07  6:39 Stephen Rothwell
2018-12-13  6:01 Stephen Rothwell
2018-12-13 11:12 ` Will Deacon
2018-12-11  6:11 linux-next: manual merge of the akpm-current tree with the FIXME tree Stephen Rothwell
2018-12-11  6:12 ` linux-next: manual merge of the akpm-current tree with the arm64 tree Stephen Rothwell
2018-12-11 10:39   ` Will Deacon
2018-12-11  6:02 Stephen Rothwell
2018-09-24  4:38 Stephen Rothwell
2018-09-24  9:32 ` Catalin Marinas
2018-07-27 10:55 Stephen Rothwell
2018-08-16  0:11 ` Stephen Rothwell
2017-11-06  5:33 Stephen Rothwell
2016-09-27  6:03 Stephen Rothwell
2016-06-22  4:54 Stephen Rothwell
2014-09-23  7:23 Stephen Rothwell
2014-09-23  8:36 ` Catalin Marinas
2014-07-24  8:42 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20151216160143.5d1a8d1e@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=akpm@linux-foundation.org \
    --cc=ard.biesheuvel@linaro.org \
    --cc=baiyaowei@cmss.chinamobile.com \
    --cc=catalin.marinas@arm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).