UCT/GGA: Backport fix #11507 to 1.21.x#11519
Open
ZhenlongMa wants to merge 1 commit into
Open
Conversation
ZhenlongMa
changed the title
Contributor
Author
|
I initially submitted a PR trying to merge the commit into branch v1.20.x by mistake. Then I closed it and recommitted this new PR. But this PR shows that perf checks were skipped "due to merge conflicts". When I check the details, it jumps to the previous PR. I am confused. I don't know why this happens and where the conflicts are. |
yosefe
approved these changes
Jun 4, 2026
brminich
approved these changes
Jun 4, 2026
Contributor
|
/azp run |
|
Azure Pipelines successfully started running 4 pipeline(s), but failed to run 1 pipeline(s). |
Contributor
|
@ZhenlongMa Could you force-push an empty amend commit? |
* UCT/IB/MLX5: Add option to disable GGA transport Add a --with-gga/--without-gga configure option to control building the GGA (DPU) MLX5 transport, and gate gga/gga_mlx5.c on a new HAVE_TL_GGA conditional instead of HAVE_MLX5_MMO. Also add the author to AUTHORS. Signed-off-by: Zhenlong Ma <zhenlongm@nvidia.com> * UCT/IB/MLX5: Address review on GGA configure option Signed-off-by: Zhenlong Ma <zhenlongm@nvidia.com> * UCT/IB/MLX5: Change with_gga checking location Signed-off-by: Zhenlong Ma <zhenlongm@nvidia.com> --------- Signed-off-by: Zhenlong Ma <zhenlongm@nvidia.com> (cherry picked from commit 10de7c0)
ZhenlongMa
force-pushed
the
backport-fix-to-1.21.x
branch
from
3f374d1 to
c8e2f84
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What?
Port changes #11507 to 1.21.x branch to support NIXL. The changes have been approved and merged into the master branch.
Why?
The motivation of the changes can be seen in #11507.
The changes are to support NIXL, which currently uses version 1.21.x.
How?
Cherry-picked the merged changes from #11507 onto the
1.21.xbranch.