Skip to content

Sync to pensando repo MAIN branch#76

Merged
sundar-pds merged 3 commits intoROCm:mainfrom
sundar-pds:sync-to-netop
Apr 22, 2026
Merged

Sync to pensando repo MAIN branch#76
sundar-pds merged 3 commits intoROCm:mainfrom
sundar-pds:sync-to-netop

Conversation

@sundar-pds
Copy link
Copy Markdown
Collaborator

Sync ROCM main branch with Pensando repo main branch changes.

@yuva29
Copy link
Copy Markdown
Collaborator

yuva29 commented Apr 22, 2026

@sundar-pds Can we make sure pensando/v1.2.0 and pensando/main are in sync expect for the version changes? Sometimes the cherry-picker might have failed. Let's just make sure all the commits are there in pensando/main.

Thanks!

@sundar-pds
Copy link
Copy Markdown
Collaborator Author

sundar-pds commented Apr 22, 2026

@sundar-pds Can we make sure pensando/v1.2.0 and pensando/main are in sync expect for the version changes? Sometimes the cherry-picker might have failed. Let's just make sure all the commits are there in pensando/main.

Thanks!

Thx for the review comment.
Yes, all change in v1.2.0 are present in main already , so we are covered there.
On the flip side, couple of commits in main are not present in 1.2.0.

  1. Fix multus config detection to support both .conf and .conflist format
  2. Fix kernel module loading order to prevent NetworkConfig deletion hang .

Second one (kmod) seems to be openshift specific.. so its not needed in v1.2.0 .
Do we need the first one cherry-picked to v1.2.0 @yuva29 ? I believe its more for a k3s requirement, which might not be needed in v1.2.0 . pls confirm .

@yuva29
Copy link
Copy Markdown
Collaborator

yuva29 commented Apr 22, 2026

@sundar-pds Can we make sure pensando/v1.2.0 and pensando/main are in sync expect for the version changes? Sometimes the cherry-picker might have failed. Let's just make sure all the commits are there in pensando/main.
Thanks!

Thx for the review comment. Yes, all change in v1.2.0 are present in main already , so we are covered there. On the flip side, couple of commits in main are not present in 1.2.0.

  1. Fix multus config detection to support both .conf and .conflist format
  2. Fix kernel module loading order to prevent NetworkConfig deletion hang .

Second one (kmod) seems to be openshift specific.. so its not needed in v1.2.0 . Do we need the first one cherry-picked to v1.2.0 @yuva29 ? I believe its more for a k3s requirement, which might not be needed in v1.2.0 . pls confirm .

Right (1) is a requirement for k3s. It need not go in v1.2.0.

So, then we are good.

@sundar-pds sundar-pds merged commit e2f5079 into ROCm:main Apr 22, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants