linux-next: manual merge of the akpm-current tree with the memblock-fixes tree

linux-next: manual merge of the akpm-current tree with the memblock-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1205 bytes --]

Hi all,

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

  drivers/of/of_reserved_mem.c

between commit:

  420175a11288 ("memblock: exclude MEMBLOCK_NOMAP regions from kmemleak")

from the memblock-fixes tree and commit:

  543b0385de82 ("memblock: rename memblock_free to memblock_phys_free")

from the akpm-current 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 drivers/of/of_reserved_mem.c
index 9da8835ba5a5,161c71e1e390..000000000000
--- a/drivers/of/of_reserved_mem.c
+++ b/drivers/of/of_reserved_mem.c
@@@ -46,8 -45,7 +46,8 @@@ static int __init early_init_dt_alloc_r
  	if (nomap) {
  		err = memblock_mark_nomap(base, size);
  		if (err)
- 			memblock_free(base, size);
+ 			memblock_phys_free(base, size);
 +		kmemleak_ignore_phys(base);
  	}
  
  	return err;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]