[all-commits] [llvm/llvm-project] cadd6e: fix merge conflict errors

[Akshat Oke via All-commits]

  Branch: refs/heads/users/optimisan/generic-regalloc-option
  Home:   https://github.com/llvm/llvm-project
  Commit: cadd6e0be445c01ea2cdfcdba38a1d4644aab6d2
      https://github.com/llvm/llvm-project/commit/cadd6e0be445c01ea2cdfcdba38a1d4644aab6d2
  Author: Akshat Oke <Akshat.Oke at amd.com>
  Date:   2025-05-02 (Fri, 02 May 2025)

  Changed paths:
    M llvm/include/llvm/Passes/PassBuilder.h
    M llvm/lib/Passes/PassBuilder.cpp
    M llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp

  Log Message:
  -----------
  fix merge conflict errors



To unsubscribe from these emails, change your notification settings at https://github.com/llvm/llvm-project/settings/notifications