On Tue, Sep 28, 2021 at 1:58 PM Mark Brown <broonie@xxxxxxxxxx> wrote: > On Tue, Sep 28, 2021 at 09:50:26AM +0200, Arnd Bergmann wrote: > > > Not sure how we'd want to merge this patch, if two other things > > need it. I'd prefer to merge it along with the QCOM_SCM change > > through the soc tree, but that leaves the cirrus firmware broken > > unless we also merge it the same way (rather than through ASoC > > as it is now). > > We could also merge a tag into both places. I wonder if I should just take my two patches as bugfixes for 5.15, after all they do address real build failures. In that case, all you need is a merge with 5.15-rc4 or higher. Arnd