* linux-next: manual merge of the xarray tree with the nnvdimm-fixes tree
@ 2018-10-12 5:54 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2018-10-12 5:54 UTC (permalink / raw)
To: Matthew Wilcox, Dan Williams
Cc: Linux-Next Mailing List, Linux Kernel Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2018-10-12 5:54 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-12 5:54 linux-next: manual merge of the xarray tree with the nnvdimm-fixes tree Stephen Rothwell
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).