On Mon, 29 Nov 2021 15:29:36 +0100, Kai Vehmanen wrote: > > Hi, > > On Mon, 29 Nov 2021, Mark Brown wrote: > > > On Mon, Nov 29, 2021 at 10:23:07AM +0100, Takashi Iwai wrote: > > > > > Mark, could you resolve in the latter branch? > > > > I'll just leave them for now, Linus got angry about merging up fixes > > just to resolve conflicts so if it's not an actual dependency... > > the asoc for-5.17 branch does have all the needed changes and the > linux-next merged version seems ok. We've already sent many further > changes that touch this area of code to asoc for-5.17. Let me know if some > actions are needed to help. The question is rather whether this discrepancy would cause a problem for further developments. If back-merging 5.16 stuff makes things easier, it should be done so. OTOH, if it's just for resolving the conflict in the final tree, we can leave it. thanks, Takashi
