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

2022-03-15 Thread Vaibhav Jain
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

2022-03-15 Thread Dan Williams
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

2022-03-15 Thread kajoljain
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") > >

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

2022-03-15 Thread Michael Ellerman
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

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