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

Hi all, On Wed, 9 May 2018 18:05:39 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the nvdimm tree got a conflict in: > > mm/hmm.c > > between commit: > > ad56b738c5dd ("docs/vm: rename documentation files to .rst") > > from the jc_docs tree and commit: > > 737b47a6db70

linux-next: manual merge of the nvdimm tree with the jc_docs tree

Hi Dan, Today's linux-next merge of the nvdimm tree got a conflict in: mm/hmm.c between commit: ad56b738c5dd ("docs/vm: rename documentation files to .rst") from the jc_docs tree and commit: 737b47a6db70 ("mm, dev_pagemap: introduce CONFIG_DEV_PAGEMAP_OPS") from the nvdimm tree. I fix