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

Stephen Rothwell writes: > Hi all, > > Today's linux-next merge of the nvdimm tree got a conflict in: > > arch/powerpc/platforms/pseries/papr_scm.c > > between commit: > > bbbca72352bb ("powerpc/papr_scm: Implement initial support for injecting > smart errors") > > from the powerpc tree and

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

On Tue, Mar 15, 2022 at 4:21 AM Michael Ellerman wrote: > > Stephen Rothwell writes: > > Hi all, > > > > Today's linux-next merge of the nvdimm tree got a conflict in: > > > > arch/powerpc/platforms/pseries/papr_scm.c > > > > between commit: > > > > bbbca72352bb ("powerpc/papr_scm: Implement

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

On 3/15/22 13:45, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the nvdimm tree got a conflict in: > > arch/powerpc/platforms/pseries/papr_scm.c > > between commit: > > bbbca72352bb ("powerpc/papr_scm: Implement initial support for injecting > smart errors") > > fro

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

Stephen Rothwell writes: > Hi all, > > Today's linux-next merge of the nvdimm tree got a conflict in: > > arch/powerpc/platforms/pseries/papr_scm.c > > between commit: > > bbbca72352bb ("powerpc/papr_scm: Implement initial support for injecting > smart errors") > > from the powerpc tree and c

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

Hi all, Today's linux-next merge of the nvdimm tree got a conflict in: arch/powerpc/platforms/pseries/papr_scm.c between commit: bbbca72352bb ("powerpc/papr_scm: Implement initial support for injecting smart errors") from the powerpc tree and commit: 4c08d4bbc089 ("powerpc/papr_scm: Ad

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

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

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

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