Skip to content

nvproxy: restore version.go changes clobbered by 0662a64ef591 - #14937

Merged
copybara-service[bot] merged 2 commits into
masterfrom
test/cl986823205
Sep 23, 2026
Merged

copybara-service[bot] merged 2 commits into
masterfrom
test/cl986823205

Conversation

@copybara-service

Copy link
Copy Markdown

nvproxy: restore version.go changes clobbered by 0662a64

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

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).
@copybara-service copybara-service Bot added the exported Issue was exported automatically label Sep 23, 2026
@copybara-service
copybara-service Bot merged commit ea36f86 into master Sep 23, 2026
7 of 10 checks passed
@copybara-service
copybara-service Bot deleted the test/cl986823205 branch September 23, 2026 18:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

exported Issue was exported automatically

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants