On Tue, Mar 15, 2022 at 4:21 AM Michael Ellerman <mpe@xxxxxxxxxxxxxx> wrote: > > Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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 commit: > > > > 4c08d4bbc089 ("powerpc/papr_scm: Add perf interface support") > > > > from the nvdimm tree. > > > > I fixed it up (see below) and can carry the fix as necessary. This > > is now fixed as far as linux-next is concerned, but any non trivial > > conflicts should be mentioned to your upstream maintainer when your tree > > is submitted for merging. You may also want to consider cooperating > > with the maintainer of the conflicting tree to minimise any particularly > > complex conflicts. > > Thanks, resolution looks obviously correct. > > Dan, this seems benign to me, I don't think any further action is > required other than mentioning it to Linus. Yes, it looks ok to me.