[libcxx-commits] [libcxx] [libcxxabi] [llvm] Adding Separate OpenMP Offloading Backend to `libcxx/include/__algorithm/pstl_backends` (PR #66968)
Johannes Doerfert via libcxx-commits
libcxx-commits at lists.llvm.org
Thu Nov 14 14:19:01 PST 2024
jdoerfert wrote:
> For all the conflicting files I just went with the changes made in upstream, since there were no modifications made on my end within these directories or files:
>
> `CONFLICT (content): Merge conflict in libcxx/docs/UserDocumentation.rst` `CONFLICT (content): Merge conflict in libcxx/docs/VendorDocumentation.rst` `CONFLICT (content): Merge conflict in libcxx/include/__pstl/backend.h` `CONFLICT (content): Merge conflict in libcxx/include/__pstl/backend_fwd.h` `CONFLICT (content): Merge conflict in libcxx/include/module.modulemap` `CONFLICT (content): Merge conflict in libcxx/utils/ci/run-buildbot` `CONFLICT (content): Merge conflict in libcxx/utils/libcxx/test/features.py`
>
> I have rebased on top of main will continue the rest of the work in a different PR as requested
Did you update the PR after the rebase, or created a new one?
https://github.com/llvm/llvm-project/pull/66968
More information about the libcxx-commits
mailing list