[clang-tools-extra] [RISCV] Added definition of Ventana veyron-v1 processor. (PR #65535)

[Michael Maitland via cfe-commits]

michaelmaitland wrote:

> Is there a way to fix this now?

I think you can drop the merge commit using `git rebase -i`. You may have to pass `--rebase-merges` to have the ability to drop the merge commit. Then you can pull upstream and `git rebase upstream/main`.

https://github.com/llvm/llvm-project/pull/65535