On 17/01/2023 15:48, Péter Ujfalusi wrote:
On 17/01/2023 15:16, Mark Brown wrote:
On Mon, Jan 16, 2023 at 02:55:03PM +0200, Peter Ujfalusi wrote:
Mark: can these be picked for 6.2?
Well, patch 2 doesn't apply so not right now...
oh. Let me see what is missing.
It is the topology ops optionality stuff. It is in itself a trivial (for my eyes) conflict, but it is a conflict never the less.
This is not going to backport cleanly to stable either.
What would be the preferred way to handle this (for next, for 6.2 and for 6.1.x)?
Applying: ASoC: SOF: sof-audio: Unprepare when swidget->use_count > 0 Using index info to reconstruct a base tree... M sound/soc/sof/sof-audio.c Falling back to patching base and 3-way merge... Auto-merging sound/soc/sof/sof-audio.c Applying: ASoC: SOF: sof-audio: skip prepare/unprepare if swidget is NULL Using index info to reconstruct a base tree... M sound/soc/sof/sof-audio.c Falling back to patching base and 3-way merge... Auto-merging sound/soc/sof/sof-audio.c CONFLICT (content): Merge conflict in sound/soc/sof/sof-audio.c