Re: [GIT PULL] Please pull powerpc/linux.git powerpc-5.12-1 tag

[Michael Ellerman]

Rob Herring <robh@xxxxxxxxxx> writes:
> On Mon, Feb 22, 2021 at 6:05 AM Michael Ellerman <mpe@xxxxxxxxxxxxxx> 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