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

[Stephen Rothwell]

Hi all,

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

  arch/arm64/kernel/setup.c

between commit:

  d91680e687f4 ("arm64: Fix /proc/iomem for reserved but not memory regions")

from Linus' tree and patch:

  "memblock: stop using implicit alignment to SMP_CACHE_BYTES"

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/arm64/kernel/setup.c
index 811e3267412a,9084fec753f5..000000000000
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@@ -215,12 -211,8 +215,13 @@@ static void __init request_standard_res
  	kernel_data.start   = __pa_symbol(_sdata);
  	kernel_data.end     = __pa_symbol(_end - 1);
  
 +	num_standard_resources = memblock.memory.cnt;
 +	standard_resources = memblock_alloc_low(num_standard_resources *
- 						sizeof(*standard_resources), 0);
++						sizeof(*standard_resources),
++						SMP_CACHE_BYTES);
 +
  	for_each_memblock(memory, region) {
 -		res = memblock_alloc_low(sizeof(*res), SMP_CACHE_BYTES);
 +		res = &standard_resources[i++];
  		if (memblock_is_nomap(region)) {
  			res->name  = "reserved";
  			res->flags = IORESOURCE_MEM;

Attachment: pgpiQ5cBbSJdZ.pgp
Description: OpenPGP digital signature