From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dan Williams <dan.j.williams@intel.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Richard Weinberger <richard@nod.at>, Jens Axboe <axboe@fb.com>
Subject: linux-next: manual merge of the nvdimm tree with Linus' tree
Date: Sat, 20 Jun 2015 22:38:55 +1000 [thread overview]
Message-ID: <20150620223855.6b83124c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
Hi Dan,
Today's linux-next merge of the nvdimm tree got a conflict in:
drivers/block/Kconfig
between commit:
b6f2098fb708 ("block: pmem: Add dependency on HAS_IOMEM")
from Linus' tree and commit:
1ffe3c5dc311 ("libnvdimm, pmem: move pmem to drivers/nvdimm/")
from the nvdimm tree.
I fixed it up (the latter incorporated the change from the former)
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-06-20 12:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-20 12:38 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-08-28 6:15 linux-next: manual merge of the nvdimm tree with Linus' tree Stephen Rothwell
2015-11-10 0:52 Stephen Rothwell
2015-11-10 1:24 Stephen Rothwell
2015-11-10 2:42 ` Dan Williams
2015-11-10 4:50 ` Stephen Rothwell
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=20150620223855.6b83124c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=axboe@fb.com \
--cc=dan.j.williams@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=richard@nod.at \
/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).