From: Dan Williams <dan.j.williams@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Christoph Hellwig <hch@lst.de>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the generic-ioremap tree with the nvdimm-fixes tree
Date: Thu, 19 Dec 2019 11:49:03 -0800 [thread overview]
Message-ID: <CAPcyv4jDozHaSCw26onPfmT1xefX2S2NB3RGL8pz1UWz=UDWWw@mail.gmail.com> (raw)
In-Reply-To: <20191218124950.191d9df4@canb.auug.org.au>
On Tue, Dec 17, 2019 at 5:50 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> On Wed, 18 Dec 2019 12:32:05 +1100 Stephen Rothwell <sfr@canb.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@canb.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@canb.auug.org.au>
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
next prev parent reply other threads:[~2019-12-19 19:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-18 1:32 linux-next: manual merge of the generic-ioremap tree with the nvdimm-fixes tree Stephen Rothwell
2019-12-18 1:49 ` Stephen Rothwell
2019-12-19 19:49 ` Dan Williams [this message]
2019-12-21 8:27 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAPcyv4jDozHaSCw26onPfmT1xefX2S2NB3RGL8pz1UWz=UDWWw@mail.gmail.com' \
--to=dan.j.williams@intel.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).