[code sync] Merge code from sonic-net/sonic-buildimage:202605 to 202608#2775
Open
mssonicbld wants to merge 4 commits into
Open
[code sync] Merge code from sonic-net/sonic-buildimage:202605 to 202608#2775mssonicbld wants to merge 4 commits into
mssonicbld wants to merge 4 commits into
Conversation
mssonicbld
commented
Jul 25, 2026
mssonicbld
commented
Collaborator
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md CODE_OF_CONDUCT.md LICENSE README.md SECURITY.md SUPPORT.md azure-pipelines failure_prs.log scripts skip_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it Broadcom SAI version 14 changes the way that the static thresholds are used. These values need to be updated for all TH5-512 skus. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it Went through all the TH5-512 hwskus and ensured the `static_th` was set to the correct value. #### How to verify it Boot device with new threshold, observe no errors related to it in syslog. <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 - [x] 202511 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> In accordance with the broadcom SAI version 14, these static threshold values need to be changed. All TH5-512 hwskus should have the same value. <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com> #### A picture of a cute animal (not mandatory but encouraged)
…1.1 (#28549) Bump LIBSAIBCM_XGS_VERSION on the 202605 release branch from 15.2.0.0.0.0.3.1 to 15.2.0.0.0.0.11.1 (SAI branch SAI_15.2.0_GA, SDK 6.5.35). This is the manual counterpart of the master bump (sonic-net/sonic-buildimage#28478); the libsaibcm .deb and the sdk-6.5.35-xgs SDK/KNET are byte-identical between master and 202605 (sai-xgs.mk is identical to master at this version). Signed-off-by: Aaron Bernardino <aaronber@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 551d207b-8ce1-40fb-b69f-291f72e021d3
… automatically (#28611) #### Why I did it src/sonic-platform-common ``` * 9da0138 - (HEAD -> 202605, origin/202605) [sonic_pcie]: Fix regex string literals to use raw strings in pcie_common.py (Azure#725) (3 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
Collaborator
Author
|
/azp run |
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
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
2 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.