[code sync] Merge code from sonic-net/sonic-buildimage:202505 to 202506#1905
Merged
mssonicbld merged 16 commits intoAzure:202506from Jan 29, 2026
Merged
[code sync] Merge code from sonic-net/sonic-buildimage:202505 to 202506#1905mssonicbld merged 16 commits intoAzure:202506from
mssonicbld merged 16 commits intoAzure:202506from
Conversation
Collaborator
mssonicbld
commented
Dec 19, 2025
mssonicbld
commented
…PE-B-O128 and update comments (#24886) <!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log 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 This PR is addressing a comment in sonic-net/sonic-buildimage#24578 by correctly set `sai_stats_support_mask` for Arista-7060X6-64PE-B-O128. Note that bit 7 is not needed for Arista-7060X6-16PE-384C-B-O128S2 as srv6 is not supported for this platform. I just updated the comment for clarity. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it #### How to verify it Confirmed pfcwd tests are passing with this change. <!-- 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 --> - [ ] 202205 - [ ] 202211 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [x] 202505 - [x] 202511 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [x] 202505 #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> <!-- 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 --> #### A picture of a cute animal (not mandatory but encouraged)
…lly (#24861) #### Why I did it src/sonic-swss ``` * c39610ec - (HEAD -> 202505, origin/202505) [202505] Fix orchagent crash handling behavior (#4047) (9 hours ago) [prabhataravind] * b6e65655 - [202505]: Cherry-pick swss build fixes from master (#4065) (2 days ago) [prabhataravind] ``` #### How I did it #### How to verify it #### Description for the changelog
* enable buster for branch 202505 Signed-off-by: yijingyan2 <yijingyan@microsoft.com>
Collaborator
Author
|
/azp run |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
Update Cisco 8000 reference version to 202505.1.0.10 for 202505 branch Description: Smartswitch specific changes: DPU graceful shutdown platform support Migrated role:Dpc config support for the DPU-NPU interfaces from somic-mgmt to port_config.ini Fixed Sensormond Traceback seen when DPUs are turned OFF Non-Smartswitch related changes: Minor platform related changes to support a few sensors, fan module support for new platforms etc. Signed-off-by: Ramesh Raghupathy <ram@cisco.com> Co-authored-by: prabhataravind <108555774+prabhataravind@users.noreply.github.com>
…lly (#24904) Signed-off-by: mssonicbld <sonicbld@microsoft.com>
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
04c97e8 to
6be7933
Compare
Collaborator
Author
|
/azp run |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
Collaborator
Author
|
/azp run |
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
6be7933 to
eddf69f
Compare
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
eddf69f to
c2bcb45
Compare
Collaborator
Author
|
/azp run |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
13.2.1.28: [CS00012430857] bcm_switch_control_set(0, bcmSwitchPcieHotSwapDisable, 1) support through SAI code 13.2.1.27: [CS00012430533] TAM object SET API call returns OBJECT_IN_USE for Streaming Telemetry [CS00012433774] Runtime setting of packet trimming not applying 13.2.1.26: Add config files for TH2 AS7816 13.2.1.25: [CSP CS00012432808]backport SONIC-109437 to rel_ocp_sai_13_2_1: fix the issue-Knet TX pkt was forwarded to wrong egress port after speed change Double commit SONIC-109388 to 13.2.1. stack-buffer-overflow in brcm_sai_set_tam_telemetry_attribute 13.2.1.24: TX_OK increments for EFP dropped packets 13.2.1.23: unwanted code path is hit. An error handler was placed earlier to catch this.add comment and mask the error. 13.2.1.22: Count Egress QDRP using flexcounters. 13.2.1.21: Ingress shared pool limit to fully utilize available cells 13.2.1.20: SAI ACL group optimization from Triple wide to Double wide mode 13.2.1.19: Add Support for port capability check for SNR and SIGNAL detect attributes 13.2.1.18: [TH5-512]: COPP Trap Not Rate Limiting within Expected Range for Neighbor Miss Packets 13.2.1.17: SAI - OCP SAI 14.1 - LTSW TH5 ISSU: ISSU is failing for all TH4/tH5 devices from 13.2.1 to sdk-6.5.34 Master 13.2.1.16: Change Error log to notice in SRV6 capability support 13.2.1.15: DNX related Signed-off-by: zitingguo <zitingguo@microsoft.com>
Collaborator
Author
|
/azp run |
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
c2bcb45 to
5a3964a
Compare
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
5a3964a to
cffe169
Compare
Collaborator
Author
|
/azp run |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
cffe169 to
97ca68c
Compare
Collaborator
Author
|
/azp run |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
97ca68c to
e6ef929
Compare
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
d962a09 to
5fe9cf4
Compare
Collaborator
Author
|
/azp run |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
5fe9cf4 to
fb89d34
Compare
Collaborator
Author
|
/azp run |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
|
/azp run Azure.sonic-buildimage-msft.PR |
|
Azure Pipelines successfully started running 1 pipeline(s). |
prabhataravind
approved these changes
Jan 25, 2026
Collaborator
Author
|
/azp run |
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
fb89d34 to
4806fcd
Compare
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
|
/azp run Azure.sonic-buildimage-msft.PR |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
Author
|
/azp run |
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
4806fcd to
db70256
Compare
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_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 Ports with lane speed >=50G use PAM4 modulation and should indicate "fec": "rs" in the port config. ##### Work item tracking - Microsoft ADO **(number only)**: - This fixes issue sonic-net/sonic-buildimage#23561 #### How I did it Check the lane speed and add "fec": "rs" for lanes with speed at least 50G. #### How to verify it `sonic-cfggen -k <device-name> --print-data | grep Ethernet0 -C 10` Make sure that fec rs is there by default if it's a PAM4 speed. Otherwise don’t insert anything To verify whether “fec”: “rs” is only being added for lane speeds above 50G, we used these 3 test inputs and show their respective outputs. Test Input 1: ``` "Ethernet0": { "autoneg": "off", "default_brkout_mode": "1x800G" }, ``` Should have fec because the lane speed is greater than 50G. Output: ``` "Ethernet0": { "alias": "Port1", "lanes": "9,10,11,12,13,14,15,16", "speed": "800000", "index": "1", "subport": "0", "fec": "rs", "autoneg": "off" }, ``` Test Input 2: ``` "Ethernet0": { "autoneg": "off", "default_brkout_mode": "4x25G" }, ``` Should not have fec because the lane speed is less than 50G. Output: ``` "Ethernet0": { "alias": "Port1/1", "lanes": "9,10", "speed": "25000", "index": "1", "subport": "1", "autoneg": "off" }, ``` Test Input 3: ``` "Ethernet0": { "autoneg": "off", "default_brkout_mode": "8x50G" }, ``` Should have fec because lane speed is 50G. Output: ``` "Ethernet0": { "alias": "Port1/1", "lanes": "9", "speed": "50000", "index": "1", "subport": "1", "fec": "rs", "autoneg": "off" } ``` <!-- 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 --> - [ ] 202205 - [ ] 202211 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 #### 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: --> <!-- 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 --> #### A picture of a cute animal (not mandatory but encouraged)
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
wolverine: Fix typo in GPO update code psu: synthesize led status if led is not present citrine: Use PMBus status word for psu status SKU: Moving LED definitions from PuffinPrime to Lodoga for MarysvillePrime sensor: add max31732 temp sensor component src: add max31732 temp sensor driver: add scd-spi support wolverine: Add GPO 1-6 updates DPM: Improve adm1266 reload cause granularity moby: use PMBUS_STATUS for psu status policy cooling: gracefully handle empty TRANSCEIVER_DOM_TEMPERATURE psu: add support for pmbus based psu status logic pcie: Add quirk for wolverine and clearwater AER correctable errors. cooling: introduce new incpid logic cooling: refactor cooling logic cooling: change data export mechanism cooling: fix database information gathering psu: add Pwr603 psu support Fix AVS VRM settings for PikeZ-MGX Add platform support for PikeZ-MGX mdio: add new mdio speed enum MdioSpeedV2 i2c: Fix error from i2c-adapter deprecated on trixie rpc/client: Raise exception on connection failures sku: fix QuicksilverP512 identification with UEFI Test CLI: Speed up and increase coverage sensors: add optional rate-limiting to sensors Setup: Deprecate background initialization for platform initialization uart: Reset TX state before each transmit citrine: use pmbus instead of scd gpio for psu status citrine: Reduce MDIO speed to 5MHz citrine: add syscpld attr in Citrine scd-mdio: Remove MAX_DEVICES_PER_BUS constraint scd-mdio: add multi-slice dev_id support Fix pylint error for trixie Fix build errors on kernel 6.12 Moby/Quicksilver: enable power cycle on rail fault citrine: fix mdio port addr and port start addr Moby/Quicksilver: disable powerCycleOnSeu and support SEU check Blackhawk: fix its pci bridge allocation on RookCpu cooling: introduce per platform config cpu: fix PuffinPrime reboot causes i2c_mux: Updates to I2cMuxBus for PCA9548 log: use parent logger for io decorators psu: add Pwr634 psu support linecard: Fix GPIO pin definitions kmod: sign kernel modules during install signed-off-by: jianquanye@microsoft.com
Collaborator
Author
|
/azp run |
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
db70256 to
5cbeab2
Compare
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
|
/azp 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
7 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.