Subject: Re: linux-next: manual merge of the sound-asoc tree with the sound-current tree

From: Mark Brown <[email-masked]>
Date: Mon, 29 Nov 2021 12:10:16 +0000

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...