Messages in this thread | | | From | Vaibhav Jain <> | Subject | Re: linux-next: manual merge of the nvdimm tree with the powerpc tree | Date | Tue, 15 Mar 2022 22:55:39 +0530 |
| |
Stephen Rothwell <sfr@canb.auug.org.au> 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 for this correction Stephen and the change looks ok to me. I verified the functionality introduced by kernel commit bbbca72352bb ("powerpc/papr_scm: Implement initial support for injecting smart errors") on the 'next-20220315' and found it to be working fine.
<snip>
-- Cheers ~ Vaibhav
| |