Re: linux-next: manual merge of the nvdimm tree with the xfs tree

2018-06-01 Thread Dan Williams
On Fri, Jun 1, 2018 at 6:33 PM, Stephen Rothwell wrote: > Hi Darrick, > > On Fri, 1 Jun 2018 17:59:48 -0700 "Darrick J. Wong" > wrote: >> >> > + if (!dax_enabled) { >> > - pr_debug("VFS (%s): error: dax support not enabled\n", >> > - sb->s_id); >> > +

Re: linux-next: manual merge of the nvdimm tree with the xfs tree

2018-06-01 Thread Stephen Rothwell
Hi Darrick, On Fri, 1 Jun 2018 17:59:48 -0700 "Darrick J. Wong" wrote: > > > + if (!dax_enabled) { > > - pr_debug("VFS (%s): error: dax support not enabled\n", > > - sb->s_id); > > + pr_debug("%s: error: dax support not enabled\n", > > +

Re: linux-next: manual merge of the nvdimm tree with the xfs tree

2018-06-01 Thread Darrick J. Wong
On Fri, Jun 01, 2018 at 06:58:46PM +1000, Stephen Rothwell wrote: > Hi Dan, > > Today's linux-next merge of the nvdimm tree got a conflict in: > > drivers/dax/super.c > > between commits: > > ba23cba9b3bd ("fs: allow per-device dax status checking for filesystems") > 80660f20252d ("dax: c

Re: linux-next: manual merge of the nvdimm tree with the xfs tree

2018-06-01 Thread Dan Williams
On Fri, Jun 1, 2018 at 1:58 AM, Stephen Rothwell wrote: > Hi Dan, > > Today's linux-next merge of the nvdimm tree got a conflict in: > > drivers/dax/super.c > > between commits: > > ba23cba9b3bd ("fs: allow per-device dax status checking for filesystems") > 80660f20252d ("dax: change bdev_da