From: Michael Ellerman <mpe@ellerman.id.au>
To: Rob Herring <robh@kernel.org>
Cc: ananth@linux.ibm.com, "Alexey Kardashevskiy" <aik@ozlabs.ru>,
kernelfans@gmail.com, cmr@codefail.de, zhengyongjun3@huawei.com,
"Oliver O'Halloran" <oohall@gmail.com>,
sandipan@linux.ibm.com, cy.fan@huawei.com,
"SF Markus Elfring" <elfring@users.sourceforge.net>,
jiapeng.chong@linux.alibaba.com, skirmisher@protonmail.com,
"Florian Fainelli" <f.fainelli@gmail.com>,
"Bhaskar Chowdhury" <unixbhaskar@gmail.com>,
eerykitty@gmail.com,
"Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>,
"Haren Myneni" <haren@linux.ibm.com>,
ganeshgr@linux.ibm.com, "Michal Suchanek" <msuchanek@suse.de>,
nathanl@linux.ibm.com, kjain@linux.ibm.com,
"Nicholas Piggin" <npiggin@gmail.com>,
"Mark Brown" <broonie@kernel.org>, "Qian Cai" <cai@lca.pw>,
"Cédric Le Goater" <clg@kaod.org>,
"Hari Bathini" <hbathini@linux.ibm.com>,
atrajeev@linux.vnet.ibm.com,
"Linus Torvalds" <torvalds@linux-foundation.org>,
"Randy Dunlap" <rdunlap@infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
fbarrat@linux.ibm.com, po-hsu.lin@canonical.com,
linuxppc-dev <linuxppc-dev@lists.ozlabs.org>
Subject: Re: [GIT PULL] Please pull powerpc/linux.git powerpc-5.12-1 tag
Date: Tue, 23 Feb 2021 12:13:33 +1100 [thread overview]
Message-ID: <87h7m3twle.fsf@mpe.ellerman.id.au> (raw)
In-Reply-To: <CAL_Jsq+5u82rS+izM2Ds0jdsQKc9C_MCFLmmRvrxhD_6ofNiJQ@mail.gmail.com>
Rob Herring <robh@kernel.org> writes:
> On Mon, Feb 22, 2021 at 6:05 AM Michael Ellerman <mpe@ellerman.id.au> wrote:
>>
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA256
>>
>> Hi Linus,
>>
>> Please pull powerpc updates for 5.12.
>>
>> There will be a conflict with the devicetree tree. It's OK to just take their
>> side of the conflict, we'll fix up the minor behaviour change that causes in a
>> follow-up patch.
>
> The issues turned out to be worse than just this, so I've dropped the
> conflicting change for 5.12.
OK, no worries.
cheers
next prev parent reply other threads:[~2021-02-23 1:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-22 12:05 [GIT PULL] Please pull powerpc/linux.git powerpc-5.12-1 tag Michael Ellerman
2021-02-22 17:41 ` Rob Herring
2021-02-23 1:13 ` Michael Ellerman [this message]
2021-02-22 22:37 ` Linus Torvalds
2021-02-22 23:00 ` Oliver O'Halloran
2021-02-23 0:53 ` Michael Ellerman
2021-02-22 22:39 ` 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=87h7m3twle.fsf@mpe.ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=aik@ozlabs.ru \
--cc=ananth@linux.ibm.com \
--cc=aneesh.kumar@linux.ibm.com \
--cc=atrajeev@linux.vnet.ibm.com \
--cc=broonie@kernel.org \
--cc=cai@lca.pw \
--cc=clg@kaod.org \
--cc=cmr@codefail.de \
--cc=cy.fan@huawei.com \
--cc=eerykitty@gmail.com \
--cc=elfring@users.sourceforge.net \
--cc=f.fainelli@gmail.com \
--cc=fbarrat@linux.ibm.com \
--cc=ganeshgr@linux.ibm.com \
--cc=haren@linux.ibm.com \
--cc=hbathini@linux.ibm.com \
--cc=jiapeng.chong@linux.alibaba.com \
--cc=kernelfans@gmail.com \
--cc=kjain@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=msuchanek@suse.de \
--cc=nathanl@linux.ibm.com \
--cc=npiggin@gmail.com \
--cc=oohall@gmail.com \
--cc=po-hsu.lin@canonical.com \
--cc=rdunlap@infradead.org \
--cc=robh@kernel.org \
--cc=sandipan@linux.ibm.com \
--cc=skirmisher@protonmail.com \
--cc=torvalds@linux-foundation.org \
--cc=unixbhaskar@gmail.com \
--cc=zhengyongjun3@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