[lkml]   [2018]   [Jul]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the xarray tree with the nvdimm tree
Hi all,

Today's linux-next merge of the xarray tree got a conflict in:


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.

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2018-07-23 09:18    [W:0.050 / U:2.616 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site