Meinersbur wrote: > I think with >1600 commits and >300kLoC changes, something went wrong here > with the merging. As mentioned by myself and others, it would be good to > rebase this and condense the commits that belong into #110298 resp. this one.
This happens when I push the branch, that has `origin/HEAD` merged into, before doing the same with the PR that it is based on. In this case I pushed the wrong branch, one of the PRs that has already been merged. Sorry about that. I now wrote a script that pushes in the right order so I hope this doesn't happen anymore. It seems that I will not be able to apply https://github.com/llvm/llvm-zorg/pull/333 in a timely manner minimize the time the buildbots are red. I am currently working on keeping the old CMake code that builds the runtime such that the buildbot builders can be updated iteratively. It has the side-effect that I need to keep the `flang/runtime/CMakeLists.txt` working which I originally wanted to avoid, but also allows splitting this patch into smaller PRs. https://github.com/llvm/llvm-project/pull/110217 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
