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

[Kai Vehmanen]

Hi,

On Mon, 29 Nov 2021, Takashi Iwai wrote:

> On Mon, 29 Nov 2021 15:29:36 +0100, Kai Vehmanen wrote:
> > 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 
> 
> 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.

I believe it's the latter case, it would be just for resolving conflict
in the final tree. The patches we have queued up for 5.17 but not yet 
sent, all apply cleanly on top of asoc for-5.17, so back-merge is not 
needed for this.

Br, Kai