Automerge failed: Merge conflict with upstream LLVM (caf619642a6d)

The automated sync with upstream LLVM failed due to merge conflicts.
  
  **Upstream commit:** caf619642a6d
  **Branch:** riscv-software
  
  Manual intervention is required to resolve the conflicts.
  
  To resolve:
  1. `git fetch upstream main`
  2. `git merge upstream/main`
  3. Resolve conflicts
  4. `git commit`
  5. `git push origin riscv-software`
  