From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Matthew Wilcox <willy@infradead•org>,
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>,
Dave Jiang <dave.jiang@intel•com>
Subject: linux-next: manual merge of the xarray tree with the nvdimm tree
Date: Mon, 23 Jul 2018 17:17:15 +1000 [thread overview]
Message-ID: <20180723171715.23328c84@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 542 bytes --]
Hi all,
Today's linux-next merge of the xarray tree got a conflict in:
fs/dax.c
between commit:
55f25ced654c ("filesystem-dax: Introduce dax_lock_mapping_entry()")
from the nvdimm tree and several commits from the xarray tree.
I have no idea how to fix this up, please discuss it and give me a
resolution (or better yet, create a command branch that both trees can
merge so that the conflicts do not exist any more).
I have temporarily dropped the xarray and ida trees for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-07-23 7:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-23 7:17 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-08-21 1:49 linux-next: manual merge of the xarray tree with the nvdimm tree Stephen Rothwell
2018-07-23 6:51 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=20180723171715.23328c84@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dan.j.williams@intel$(echo .)com \
--cc=dave.jiang@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=willy@infradead$(echo .)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