Skip to content

Conversation

@mehrdadh
Copy link
Member

Fixing bad merge after #8940

@elvin-n
Copy link
Contributor

elvin-n commented Sep 10, 2021

deadlock - issues with QEMU is fixed in this PR, issue with CPU is fixed in PR8981. Both PR should be merged simultaneously or both changes should go in one PR to see green pre-commit on PR stage

@mehrdadh
Copy link
Member Author

@elvin-n great point. Do you mind if I add your changes to my PR?

@mehrdadh
Copy link
Member Author

Added changes from this PR: #8981 since we need to merge these together to pass the CI.

@areusch areusch merged commit b7d3eac into apache:main Sep 10, 2021
@areusch
Copy link
Contributor

areusch commented Sep 10, 2021

thanks @elvin-n @u99127 @mehrdadh , the fix is merged!

ylc pushed a commit to ylc/tvm that referenced this pull request Sep 29, 2021
* fix bad merge

* Fix test to reflect change of simd size for ARM
@mehrdadh mehrdadh deleted the zephyr_bad_merge branch November 11, 2021 21:30
ylc pushed a commit to ylc/tvm that referenced this pull request Jan 13, 2022
* fix bad merge

* Fix test to reflect change of simd size for ARM
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.

3 participants