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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20211022191015.5d8abec8@canb.auug.org.au>
Date:   Fri, 22 Oct 2021 19:10:15 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        Mike Rapoport <rppt@...nel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Mike Rapoport <rppt@...ux.ibm.com>
Subject: linux-next: manual merge of the akpm-current tree with the
 memblock-fixes tree

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;

Content of type "application/pgp-signature" skipped