From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Verma, Vishal L" <vishal.l.verma@intel.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Dan Williams <dan.j.williams@intel.com>, Jan Kara <jack@suse.cz>
Subject: linux-next: manual merge of the dax-misc tree with the nvdimm tree
Date: Wed, 18 May 2016 13:34:13 +1000 [thread overview]
Message-ID: <20160518133413.7b76b99e@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the dax-misc tree got a conflict in:
fs/block_dev.c
between commit:
8044aae6f374 ("Revert "block: enable dax for raw block devices"")
from the nvdimm tree and commit:
02fbd139759f ("dax: Remove complete_unwritten argument")
from the dax-misc tree.
I fixed it up (the former removed the code modified by the latter) 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
reply other threads:[~2016-05-18 3:34 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20160518133413.7b76b99e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dan.j.williams@intel.com \
--cc=jack@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=vishal.l.verma@intel.com \
/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).