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>
Subject: linux-next: manual merge of the xarray tree with the nnvdimm-fixes tree
Date: Fri, 12 Oct 2018 16:54:54 +1100 [thread overview]
Message-ID: <20181012165454.06e718a0@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 777 bytes --]
Hi all,
Today's linux-next merge of the xarray tree got a conflict in:
fs/dax.c
between commit:
d7782145e1ad ("filesystem-dax: Fix dax_layout_busy_page() livelock")
from the nvdimm-fixes tree and commit:
0995344c1493 ("dax: Convert dax_layout_busy_page to XArray")
from the xarray tree.
I fixed it up (I just used the latter - please let me know if more id
needed) 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 --]
reply other threads:[~2018-10-12 5:54 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=20181012165454.06e718a0@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dan.j.williams@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