Repository navigation
nvproxy: restore version.go changes clobbered by 0662a64ef591 - #14911
Merged
copybara-service[bot] merged 1 commit intoSep 23, 2026
Merged
Conversation
The merge of google#14449 (0662a64) was generated against a stale copy of version.go and unintentionally reverted parts of three earlier commits in that file: - 007c898 "nvproxy: Add support for NVIDIA driver version 615.71.09": lost the 610.57.04/615.71.09 version chain (615.15.00 and 620.06.00 were reparented back to their pre-615.71.09 parents), NV0000_CTRL_OS_UNIX_CMD_MEMACCT_GET_LIMITS on 610.43.02, and the compUtil capability on NV2080_CTRL_CMD_CE_GET_CE_PCE_MASK. - c55de35 "Update signature for NV2080_CTRL_CMD_NVLINK_GET_REMAP_TABLE_INFO_V2 in nvproxy.": lost the ioctlInfo signature update on 620.06.00. - 2eeb2f0 "Add support for NV2080_CTRL_CMD_NVLINK_SET_NVLE_READY in NVIDIA driver 620.30": lost the control command registration on 620.30. Restore all of the above by reverting the version.go diff of 0662a64 and re-applying its intended additions (the AMPERE_B allocation class and NVB0CC_CTRL_CMD_GET_HS_CREDITS_MAPPING).
3 tasks done
Contributor
|
Thank you! |
EtiennePerot
approved these changes
Sep 23, 2026
copybara-service Bot
pushed a commit
that referenced
this pull request
Sep 23, 2026
The merge of #14449 (0662a64) was generated against a stale copy of version.go and unintentionally reverted parts of three earlier commits in that file: - 007c898 "nvproxy: Add support for NVIDIA driver version 615.71.09": lost the 610.57.04/615.71.09 version chain (615.15.00 and 620.06.00 were reparented back to their pre-615.71.09 parents), NV0000_CTRL_OS_UNIX_CMD_MEMACCT_GET_LIMITS on 610.43.02, and the compUtil capability on NV2080_CTRL_CMD_CE_GET_CE_PCE_MASK. - c55de35 "Update signature for NV2080_CTRL_CMD_NVLINK_GET_REMAP_TABLE_INFO_V2 in nvproxy.": lost the ioctlInfo signature update on 620.06.00. - 2eeb2f0 "Add support for NV2080_CTRL_CMD_NVLINK_SET_NVLE_READY in NVIDIA driver 620.30": lost the control command registration on 620.30. Restore all of the above by reverting the version.go diff of 0662a64 and re-applying its intended additions (the AMPERE_B allocation class and NVB0CC_CTRL_CMD_GET_HS_CREDITS_MAPPING). FUTURE_COPYBARA_INTEGRATE_REVIEW=#14911 from ayushr2:nvproxy-version-restore 346de8c PiperOrigin-RevId: 986823205
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
3 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.
The merge of #14449 (0662a64) was generated against a stale copy of version.go and unintentionally reverted parts of three earlier commits in that file:
007c898 "nvproxy: Add support for NVIDIA driver version 615.71.09": lost the 610.57.04/615.71.09 version chain (615.15.00 and 620.06.00 were reparented back to their pre-615.71.09 parents), NV0000_CTRL_OS_UNIX_CMD_MEMACCT_GET_LIMITS on 610.43.02, and the compUtil capability on NV2080_CTRL_CMD_CE_GET_CE_PCE_MASK.
c55de35 "Update signature for NV2080_CTRL_CMD_NVLINK_GET_REMAP_TABLE_INFO_V2 in nvproxy.": lost the ioctlInfo signature update on 620.06.00.
2eeb2f0 "Add support for NV2080_CTRL_CMD_NVLINK_SET_NVLE_READY in NVIDIA driver 620.30": lost the control command registration on 620.30.
Restore all of the above by reverting the version.go diff of 0662a64 and re-applying its intended additions (the AMPERE_B allocation class and NVB0CC_CTRL_CMD_GET_HS_CREDITS_MAPPING).