From: Michael Ellerman <mpe@ellerman.id.au>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: ajd@linux.ibm.com,
"Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>,
atrajeev@linux.vnet.ibm.com, bauerman@linux.ibm.com,
biwen.li@nxp.com, Qian Cai <cai@lca.pw>,
cheloha@linux.ibm.com,
Christophe Leroy <christophe.leroy@csgroup.eu>,
clg@kaod.org, Colin King <colin.king@canonical.com>,
David Miller <davem@davemloft.net>,
Daniel Axtens <dja@axtens.net>,
ego@linux.vnet.ibm.com, fbarrat@linux.ibm.com,
fthain@telegraphics.com.au, gromero@linux.ibm.com,
Christoph Hellwig <hch@lst.de>,
hofrat@osadl.org, jniethe5@gmail.com,
Joel Stanley <joel@jms.id.au>,
kjain@linux.ibm.com, leobras.c@gmail.com,
Li Yang <leoyang.li@nxp.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
linuxppc-dev <linuxppc-dev@lists.ozlabs.org>,
liushixin2@huawei.com, mahesh@linux.ibm.com,
miaoqinglang@huawei.com, mrochs@linux.ibm.com,
nathanl@linux.ibm.com,
"Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>,
Nick Piggin <npiggin@gmail.com>,
Oliver O'Halloran <oohall@gmail.com>,
Paul Mackerras <paulus@ozlabs.org>,
Peter Zijlstra <peterz@infradead.org>,
Ravi Bangoria <ravi.bangoria@linux.ibm.com>,
Russell Currey <ruscur@russell.cc>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Srikar Dronamraju <srikar@linux.vnet.ibm.com>,
Stephen Kitt <steve@sk2.org>,
Vaibhav Jain <vaibhav@linux.ibm.com>,
wangwensheng4@huawei.com, Wolfram Sang <wsa@kernel.org>,
yanaijie@huawei.com, yangyingliang@huawei.com,
zhengbin <zhengbin13@huawei.com>
Subject: Re: [GIT PULL] Please pull powerpc/linux.git powerpc-5.10-1 tag
Date: Sat, 17 Oct 2020 21:12:27 +1100 [thread overview]
Message-ID: <874kmtyxdg.fsf@mpe.ellerman.id.au> (raw)
In-Reply-To: <CAHk-=wjTwLKR1YhVHv5UzvCag5jxBeKVxLLxN9-CoxQYhi_=Kw@mail.gmail.com>
Linus Torvalds <torvalds@linux-foundation.org> writes:
> On Thu, Oct 15, 2020 at 8:24 PM Michael Ellerman <mpe@ellerman.id.au> wrote:
>>
>> Just two minor conflicts I'm aware of. The only slight subtlety is the conflict
>> in kasan_init() where "int ret" needs to move out of the for_each_mem_range()
>> and up to the function scope.
>
> Well, there was also a conflict for the dependencies of OCXL.
Yep, it was so trivial I didn't think it was worth calling out.
> I resolved that by ruthlessly simplifying the dependency:
>
> - depends on PPC_POWERNV && PCI && EEH && HOTPLUG_PCI_POWERNV
> - depends on PPC_POWERNV && PCI && EEH && PPC_XIVE_NATIVE
> ++ depends on HOTPLUG_PCI_POWERNV
>
> because all the other dependencies seem to be pointless.
>
> HOTPLUG_PCI_POWERNV already has a
>
> depends on PPC_POWERNV && EEH
>
> so there's no point in repeating those.
And PPC_POWERNV selects FORCE_PCI, which takes care of the dependency on
PCI.
> And PPC_XIVE_NATIVE is selected by PPC_POWERNV, so if PPC_POWERNV, we
> know PPC_XIVE_NATIVE is set.
>
> Maybe I missed something strange, so I'm just letting you know so you
> can blame me if I broke something.
No, that looks good to me. Thanks.
cheers
prev parent reply other threads:[~2020-10-17 10:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-16 3:24 Michael Ellerman
2020-10-16 19:22 ` Linus Torvalds
2020-10-17 10:12 ` Michael Ellerman [this message]
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=874kmtyxdg.fsf@mpe.ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=ajd@linux.ibm.com \
--cc=aneesh.kumar@linux.ibm.com \
--cc=atrajeev@linux.vnet.ibm.com \
--cc=bauerman@linux.ibm.com \
--cc=biwen.li@nxp.com \
--cc=cai@lca.pw \
--cc=cheloha@linux.ibm.com \
--cc=christophe.leroy@csgroup.eu \
--cc=clg@kaod.org \
--cc=colin.king@canonical.com \
--cc=davem@davemloft.net \
--cc=dja@axtens.net \
--cc=ego@linux.vnet.ibm.com \
--cc=fbarrat@linux.ibm.com \
--cc=fthain@telegraphics.com.au \
--cc=gromero@linux.ibm.com \
--cc=hch@lst.de \
--cc=hofrat@osadl.org \
--cc=jniethe5@gmail.com \
--cc=joel@jms.id.au \
--cc=kjain@linux.ibm.com \
--cc=leobras.c@gmail.com \
--cc=leoyang.li@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=liushixin2@huawei.com \
--cc=mahesh@linux.ibm.com \
--cc=miaoqinglang@huawei.com \
--cc=mrochs@linux.ibm.com \
--cc=nathanl@linux.ibm.com \
--cc=naveen.n.rao@linux.vnet.ibm.com \
--cc=npiggin@gmail.com \
--cc=oohall@gmail.com \
--cc=paulus@ozlabs.org \
--cc=peterz@infradead.org \
--cc=ravi.bangoria@linux.ibm.com \
--cc=ruscur@russell.cc \
--cc=sfr@canb.auug.org.au \
--cc=srikar@linux.vnet.ibm.com \
--cc=steve@sk2.org \
--cc=torvalds@linux-foundation.org \
--cc=vaibhav@linux.ibm.com \
--cc=wangwensheng4@huawei.com \
--cc=wsa@kernel.org \
--cc=yanaijie@huawei.com \
--cc=yangyingliang@huawei.com \
--cc=zhengbin13@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®