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

[Arnd Bergmann]

On Tue, Feb 8, 2022 at 11:33 AM Sudeep Holla <sudeep.holla at arm.com> wrote:
> On Tue, Feb 08, 2022 at 11:00:43AM +0100, Arnd Bergmann wrote:
> > As the contents are still fine, I could offer to either merge the branch again
> > for v5.18, or I can drop it and wait for a new pull request from you, please
> > let me know your preference.
> >
>
> Is it OK if I merge this tag with v5.17-rc1 as base and load it with any
> new v5.18 material on the top ? I just want to avoid rebasing as the same time
> some of the new material depend on these changes. Let me know if that
> is fine. I am open to any other suggestions too.

Yes, I think that is ok, as long as you start a branch from v5.17-rc1 and merge
the old contents into the new branch, rather than back-merging the -rc1 tag
into your existing branch. This way, the git history still makes sense
across the
merges.

       Arnd