https://github.com/AaronBallman commented: There's a merge conflict with the release notes that will have to be resolved, but if we're going to cherry-pick this to 23.x, we can do that on the release branch instead of here. https://github.com/llvm/llvm-project/pull/195377