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

[kajoljain <kjain@linux.ibm.com>]

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")
> 
> 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.
> 

Hi Stephan,
         The change for resolving merged trees issue looks good to me. I
also tested the latest linux-next tree - master branch with
next-20220315 changes and the papr_scm perf interface is working as
expected. Thanks for correcting it.

Thanks,
Kajol Jain