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

Sudeep Holla sudeep.holla at arm.com
Fri Nov 27 05:00:07 EST 2020


On Thu, Nov 26, 2020 at 09:54:50PM +0100, Arnd Bergmann wrote:
> 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.
> 

Unfortunately the branch/tag I shared with Mark Brown to merge the voltage
regulator part is also based on -rc2. I might have to drop those patches
from this pull request if I need to rebase on -rc1. If that's OK, I can
send fresh/new PR based on -rc1. Sorry for the trouble.

-- 
Regards,
Sudeep



More information about the linux-arm-kernel mailing list