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

2018-01-29 Thread Dan Williams
On Sun, Jan 28, 2018 at 10:04 PM, Stephen Rothwell wrote: > Hi Dan, > > Today's linux-next merge of the nvdimm tree got a conflict in: > > arch/powerpc/sysdev/axonram.c > > between commit: > > 1d65b1c886be ("powerpc/cell: Remove axonram driver") > > from the powerpc tree and commit: > > 785

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

2018-01-28 Thread Stephen Rothwell
Hi Dan, Today's linux-next merge of the nvdimm tree got a conflict in: arch/powerpc/sysdev/axonram.c between commit: 1d65b1c886be ("powerpc/cell: Remove axonram driver") from the powerpc tree and commit: 785a3fab4adb ("mm, dax: introduce pfn_t_special()") from the nvdimm tree. I fixed

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

2018-01-28 Thread Stephen Rothwell
Hi Dan, Today's linux-next merge of the nvdimm tree got a conflict in: arch/powerpc/platforms/Kconfig between commit: 1d65b1c886be ("powerpc/cell: Remove axonram driver") from the powerpc tree and commit: 569d0365f571 ("dax: require 'struct page' by default for filesystem dax") from th