From: Vaibhav Jain <vaibhav@linux•ibm.com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Dan Williams <dan.j.williams@intel•com>,
Michael Ellerman <mpe@ellerman•id.au>,
PowerPC <linuxppc-dev@lists•ozlabs.org>
Cc: Kajol Jain <kjain@linux•ibm.com>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Shivaprasad G Bhat <sbhat@linux•ibm.com>
Subject: Re: linux-next: manual merge of the nvdimm tree with the powerpc tree
Date: Tue, 15 Mar 2022 22:55:39 +0530 [thread overview]
Message-ID: <87v8wfb018.fsf@vajain21.in.ibm.com> (raw)
In-Reply-To: <20220315191538.323eefbb@canb.auug.org.au>
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
next prev parent reply other threads:[~2022-03-15 17:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-15 8:15 linux-next: manual merge of the nvdimm tree with the powerpc tree Stephen Rothwell
2022-03-15 11:04 ` Michael Ellerman
2022-03-15 14:55 ` Dan Williams
2022-03-15 13:48 ` kajoljain
2022-03-15 17:25 ` Vaibhav Jain [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-01-29 6:04 Stephen Rothwell
2018-01-29 22:49 ` Dan Williams
2018-01-29 6:01 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87v8wfb018.fsf@vajain21.in.ibm.com \
--to=vaibhav@linux$(echo .)ibm.com \
--cc=dan.j.williams@intel$(echo .)com \
--cc=kjain@linux$(echo .)ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mpe@ellerman$(echo .)id.au \
--cc=sbhat@linux$(echo .)ibm.com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox