[PATCH] D154412: [RISCV] Add support for XCVbi extension in CV32E40P

[Nico Weber via Phabricator via llvm-commits]

thakis added a comment.

Looks like you checked in a merge conflict marker,http://45.33.8.238/linux/113808/step_12.txt

Please take a look and revert for now if it takes a while to fix. And please run tests locally as last step before committing.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D154412/new/

https://reviews.llvm.org/D154412