[GIT PULL] firmware: arm_scmi: Updates for v5.11

[Arnd Bergmann]

On Tue, Nov 24, 2020 at 1:24 PM Sudeep Holla <sudeep.holla at arm.com> wrote:
>
> Hi ARM SoC Team,
>
> Please pull ! The tag is based on v5.10-rc2 to avoid conflicts with
> the fixes that got merged in -rc2.

Is there no way to avoid this? I would really prefer not to have to backmerge
rc2 into my existing branch if it's just about the bugfix.

I tried rebasing your branch onto -rc2 and only got a trivial conflict
in one line, and even that could be avoided by merging in your
bugfix branch instead of the whole -rc2.

     Arnd