linux-kernel - Re: linux-next: manual merge of the generic-ioremap tree with the nvdimm-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>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20191218124950.191d9df4@canb.auug.org.au>
Date:   Wed, 18 Dec 2019 12:49:50 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Christoph Hellwig <hch@....de>,
        Dan Williams <dan.j.williams@...el.com>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the generic-ioremap tree with the
 nvdimm-fixes tree

Hi all,

On Wed, 18 Dec 2019 12:32:05 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the generic-ioremap tree got a conflict in:
> 
>   tools/testing/nvdimm/Kbuild
> 
> between commit:
> 
>   c14685547762 ("tools/testing/nvdimm: Fix mock support for ioremap")
> 
> from the nvdimm-fixes tree and commit:
> 
>   1188dd7d3fbd ("remove ioremap_nocache and devm_ioremap_nocache")
> 
> from the generic-ioremap tree.
> 
> I fixed it up (the latter is a superset of the former) 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.

The merge also needed this fixup (since both trees logically added the
same small function):

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Wed, 18 Dec 2019 12:46:03 +1100
Subject: [PATCH] generic_ioremap: merge fix for "tools/testing/nvdimm: Fix
 mock support for ioremap"

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 tools/testing/nvdimm/test/iomap.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tools/testing/nvdimm/test/iomap.c b/tools/testing/nvdimm/test/iomap.c
index 27a9c5f3fcd0..03e40b3b0106 100644
--- a/tools/testing/nvdimm/test/iomap.c
+++ b/tools/testing/nvdimm/test/iomap.c
@@ -193,12 +193,6 @@ void __iomem *__wrap_ioremap(resource_size_t offset, unsigned long size)
 }
 EXPORT_SYMBOL(__wrap_ioremap);
 
-void __iomem *__wrap_ioremap(resource_size_t offset, unsigned long size)
-{
-	return __nfit_test_ioremap(offset, size, ioremap);
-}
-EXPORT_SYMBOL(__wrap_ioremap);
-
 void __iomem *__wrap_ioremap_wc(resource_size_t offset, unsigned long size)
 {
 	return __nfit_test_ioremap(offset, size, ioremap_wc);
-- 
2.24.0

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped