Skip to content

mtl: copier-host: fix build issue - #8015

Merged
kv2019i merged 1 commit into
thesofproject:mainfrom
tmleman:topic/upstream/pr/mtl/copier/fix/build_issue
Aug 9, 2023
Merged

kv2019i merged 1 commit into
thesofproject:mainfrom
tmleman:topic/upstream/pr/mtl/copier/fix/build_issue

Conversation

@tmleman

@tmleman tmleman commented Aug 8, 2023

Copy link
Copy Markdown
Contributor

After commit f639fc8 ("copier: rename parent_dev to dev") FW for MTL platform is not building. This should be detected b as merge conflict but it went unnoticed.

@btian1 btian1 left a comment •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kv2019i , merge sequence caused this issue, #7964 merged first and it add parent_dev code, #7958 need rebase before merge.
Or if merge #7958 first, then #7964 need rebase, this is the reason.

@btian1
btian1 requested a review from kv2019i August 9, 2023 02:17
After commit f639fc8 ("copier: rename parent_dev to dev") FW for MTL
platform is not building. This should be detected as merge conflict but it
went unnoticed.

Signed-off-by: Tomasz Leman <tomasz.m.leman@intel.com>
@tmleman
tmleman force-pushed the topic/upstream/pr/mtl/copier/fix/build_issue branch from 8903434 to 7f598e0 Compare August 9, 2023 06:34
@wszypelt

wszypelt commented Aug 9, 2023 •

Copy link
Copy Markdown

@lgirdwood we need this fix. then CI will work properly with other PR, so far it crashes everything when building. As for this PR internal intel CI goes green:
image

@kv2019i

kv2019i commented Aug 9, 2023

Copy link
Copy Markdown
Collaborator

Merging directly to unlock other CI runs.

@kv2019i
kv2019i merged commit 17cb6d9 into thesofproject:main Aug 9, 2023
@tmleman
tmleman deleted the topic/upstream/pr/mtl/copier/fix/build_issue branch December 17, 2025 12:14
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.

6 participants