[RISCV] Added definition of Ventana veyron-v1 processor.

[mgudim]

No description provided.

[michaelmaitland]

Merge branch 'llvm:main' into mgudim_veyron_def

The LLVM GitHub User Guide recommends to rebase on main instead of merge main.

[mgudim]

Merge branch 'llvm:main' into mgudim_veyron_def

The LLVM GitHub User Guide recommends to rebase on main instead of merge main.

Yes, my bad. Still learning the new workflow. I got this merge commit after pressing the "sync" button on my fork. Is there a way to fix this now?

[michaelmaitland]

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.

[mgudim]

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.

Thanks Michael, I tried but messed it up (I see more changes than I intended). Let me try again. If I mess it up again, is it OK if I just close this PR and start over?

[michaelmaitland]

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.

Thanks Michael, I tried but messed it up (I see more changes than I intended). Let me try again. If I mess it up again, is it OK if I just close this PR and start over?

I think you could drop 5fe9e82 using git rebase -i, recommit it with only the changes you want, and then follow the LLVM GitHub User Guide on how to rebase on main.

But if you want to close this PR and make another PR, thats fine by me.