Skip to content

Conversation

@juimonen
Copy link

Fix bt offload pipeline with instance ids. This was an unfortunate merge error with recent instance id topology2 commit.

Signed-off-by: Jaska Uimonen jaska.uimonen@intel.com

Fix bt offload pipeline with instance ids. This was an unfortunate merge
error with recent instance id topology2 commit.

Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
@kv2019i kv2019i merged commit e4dc655 into thesofproject:main Jan 27, 2023
@marc-hb
Copy link
Collaborator

marc-hb commented Jan 27, 2023

Which commit does this Fixes: and how did that escape CI?

EDIT: answering myself: these two files are brand new, just came in commit 4476171, which was merged in #6971, which passed all checks.

Was there some ALSA change around the same time?

@marc-hb
Copy link
Collaborator

marc-hb commented Jan 27, 2023

There was "logical" conflict between 4476171 and ae8ca22. They both passed separately but not together - and CI never tested them together.

More in #6971.

These two commit SHA1s should definitely have been present in the commit message (which I now finally understand)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants