From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christoph Hellwig <hch@lst•de>, Dan Williams <dan.j.williams@intel•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: linux-next: manual merge of the generic-ioremap tree with the nvdimm-fixes tree
Date: Wed, 18 Dec 2019 12:32:05 +1100 [thread overview]
Message-ID: <20191218123205.3fb9c793@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 799 bytes --]
Hi all,
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-12-18 1:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-18 1:32 Stephen Rothwell [this message]
2019-12-18 1:49 ` linux-next: manual merge of the generic-ioremap tree with the nvdimm-fixes tree Stephen Rothwell
2019-12-19 19:49 ` Dan Williams
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=20191218123205.3fb9c793@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dan.j.williams@intel$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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