From: Michael Ellerman <mpe@ellerman•id.au>
To: Linus Torvalds <torvalds@linux-foundation•org>
Cc: ego@linux•vnet.ibm.com, emmanuel.nicolet@gmail•com,
chenzhou10@huawei•com, jniethe5@gmail•com, linuxram@us•ibm.com,
kernelfans@gmail•com,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
st5pub@yandex•ru, Oliver O'Halloran <oohall@gmail•com>,
huhai@tj•kylinos.cn,
Markus Elfring <elfring@users•sourceforge.net>,
rzinsly@linux•ibm.com, leobras.c@gmail•com, mikey@neuling•org,
Herbert Xu <herbert@gondor•apana.org.au>,
"Aneesh Kumar K.V" <aneesh.kumar@linux•ibm.com>,
haren@linux•ibm.com, michal.simek@xilinx•com,
mahesh@linux•ibm.com, Takashi Iwai <tiwai@suse•de>,
kjain@linux•ibm.com, leonardo@linux•ibm.com,
"Naveen N. Rao" <naveen.n.rao@linux•vnet.ibm.com>,
Ravi Bangoria <ravi.bangoria@linux•ibm.com>,
ajd@linux•ibm.com, Arnd Bergmann <arnd@arndb•de>,
Stephen Rothwell <sfr@canb•auug.org.au>,
alistair@popple•id.au, Nick Piggin <npiggin@gmail•com>,
wangxiongfeng2@huawei•com, Qian Cai <cai@lca•pw>,
clg@kaod•org, Nathan Chancellor <natechancellor@gmail•com>,
hbathini@linux•ibm.com,
Christophe Leroy <christophe.leroy@c-s•fr>,
geoff@infradead•org, Dmitry Torokhov <dmitry.torokhov@gmail•com>,
"Gustavo A. R. Silva" <gustavoars@kernel•org>,
wsa@kernel•org, sbobroff@linux•ibm.com, fbarrat@linux•ibm.com,
Christophe JAILLET <christophe.jaillet@wanadoo•fr>,
Andrew Morton <akpm@linux-foundation•org>,
linuxppc-dev <linuxppc-dev@lists•ozlabs.org>
Subject: Re: [GIT PULL] Please pull powerpc/linux.git powerpc-5.8-1 tag
Date: Sat, 06 Jun 2020 10:45:37 +1000 [thread overview]
Message-ID: <87a71hggy6.fsf@mpe.ellerman.id.au> (raw)
In-Reply-To: <CAHk-=wh5vSwYqF=YiKOOGBHE=hCwnes_ndbP4QOyjPK_Xocz7w@mail.gmail.com>
Linus Torvalds <torvalds@linux-foundation•org> writes:
> On Fri, Jun 5, 2020 at 9:38 AM Michael Ellerman <mpe@ellerman•id.au> wrote:
>>
>> I've pushed the result of my resolution of the conflicts to the powerpc/merge
>> branch, if you want to look at that, though I've also tried to describe it in
>> full below.
>
> I ended up doing the machine_check_exception() differently, because I
> felt the code itself was done wrong and I wanted to add a note about
> that.
>
> Having the same function have completely different semantics depending
> on a platform issue is just fundamentally wrong, and makes not just
> for fragile code, but also means that you can't do single image
> kernels.
Yeah I agree it's not that nicely structured.
In this case CONFIG_PPC_BOOK3S_64 is one of our top-level compile time
switches anyway, so the single image thing at least isn't a concern.
> It should be two different functions, possibly just
>
> non_nmi_fn() { ... }
>
> nmi_fn() { nmi_enter(); non_nmi_fn(); nmi_exit(); }
>
> and now you don't have odd rules for the same function that depends on
> how the platform happens to call it.
Agreed.
> I didn't do the above. I did something that looked like the old code,
> but had a comment. Oh well.
Thanks, we can restructure it later.
> But thanks for describing the merge, I'd have missed the place where
> there was a new use of pgd_oiffset().
Yeah I missed it to begin with :}
> ..and then when I actually compared whether I otherwise got the same
> result as you, I realized that this all depends on the module tree.
>
> I'll go merge that first, and then re-do this all. Oh well.
Darn it. I figured you'd have merged that by the time you saw my pull,
will mention anything similar in future.
cheers
next prev parent reply other threads:[~2020-06-06 0:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-05 16:38 [GIT PULL] Please pull powerpc/linux.git powerpc-5.8-1 tag Michael Ellerman
2020-06-05 19:01 ` Linus Torvalds
2020-06-05 20:39 ` Linus Torvalds
2020-06-06 0:50 ` Michael Ellerman
2020-06-06 0:45 ` Michael Ellerman [this message]
2020-06-05 20:40 ` pr-tracker-bot
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=87a71hggy6.fsf@mpe.ellerman.id.au \
--to=mpe@ellerman$(echo .)id.au \
--cc=ajd@linux$(echo .)ibm.com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=alistair@popple$(echo .)id.au \
--cc=aneesh.kumar@linux$(echo .)ibm.com \
--cc=arnd@arndb$(echo .)de \
--cc=cai@lca$(echo .)pw \
--cc=chenzhou10@huawei$(echo .)com \
--cc=christophe.jaillet@wanadoo$(echo .)fr \
--cc=christophe.leroy@c-s$(echo .)fr \
--cc=clg@kaod$(echo .)org \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=ego@linux$(echo .)vnet.ibm.com \
--cc=elfring@users$(echo .)sourceforge.net \
--cc=emmanuel.nicolet@gmail$(echo .)com \
--cc=fbarrat@linux$(echo .)ibm.com \
--cc=geoff@infradead$(echo .)org \
--cc=gustavoars@kernel$(echo .)org \
--cc=haren@linux$(echo .)ibm.com \
--cc=hbathini@linux$(echo .)ibm.com \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=huhai@tj$(echo .)kylinos.cn \
--cc=jniethe5@gmail$(echo .)com \
--cc=kernelfans@gmail$(echo .)com \
--cc=kjain@linux$(echo .)ibm.com \
--cc=leobras.c@gmail$(echo .)com \
--cc=leonardo@linux$(echo .)ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=linuxram@us$(echo .)ibm.com \
--cc=mahesh@linux$(echo .)ibm.com \
--cc=michal.simek@xilinx$(echo .)com \
--cc=mikey@neuling$(echo .)org \
--cc=natechancellor@gmail$(echo .)com \
--cc=naveen.n.rao@linux$(echo .)vnet.ibm.com \
--cc=npiggin@gmail$(echo .)com \
--cc=oohall@gmail$(echo .)com \
--cc=ravi.bangoria@linux$(echo .)ibm.com \
--cc=rzinsly@linux$(echo .)ibm.com \
--cc=sbobroff@linux$(echo .)ibm.com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=st5pub@yandex$(echo .)ru \
--cc=tiwai@suse$(echo .)de \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=wangxiongfeng2@huawei$(echo .)com \
--cc=wsa@kernel$(echo .)org \
/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