On Tue, Dec 17, 2019 at 5:50 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
>
> On Wed, 18 Dec 2019 12:32:05 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx>
> 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@xxxxxxxxxxxxxxxx>
Hi Stephen,
Thanks for the heads up.
Christoph are you going to submit that for v5.5 or is that v5.6 material?
> ---
> 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
