Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202411 to 202412#750

Merged
mssonicbld merged 6 commits intoAzure:202412from
mssonicbld:sonicbld/202412-merge
Mar 1, 2025
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202411 to 202412#750
mssonicbld merged 6 commits intoAzure:202412from
mssonicbld:sonicbld/202412-merge

Conversation

@mssonicbld
Copy link
Copy Markdown
Collaborator

* d8287d8c5 - (head/202411) [Mellanox] Fix the issue with sensors with discrete indexes initialization (#21890) (2025-03-01) [mssonicbld]
* f3dd569cd - Update Broadcom DNX SAI to 12.3 and update kernel drivers (#21873) (2025-02-28) [Tejaswini Chadaga]
* dac861a06 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#21859) (2025-02-27) [mssonicbld]
* 833485165 - Update PG flow control threshold based on port speed (not on hwsku) (#21834) (2025-02-26) [mssonicbld]
* 87e9f8239 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#21839) (2025-02-25) [mssonicbld]<br>```

mssonicbld and others added 6 commits February 25, 2025 19:01
…lly (#21839)

#### Why I did it
src/sonic-swss
```
* e21b5a5a - (HEAD -> 202411, origin/202411) Link orchagent against jemalloc (#3530) (22 hours ago) [mssonicbld]
* aac84b5d - Merge pull request #3531 from mssonicbld/cherry/202411/3426 (26 hours ago) [Kumaresh Perumal]
* 272f45a9 - vlanmgrd not to throw exception for Portchannel ip link add because of race condition with PortChannel removal. (29 hours ago) [Sonic Build Admin]
```
#### How I did it
#### How to verify it
#### Description for the changelog
…#21834)

<!--
 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
To update PG flow control threshold alpha value based on port speed. Current assumption was based on hwsku.

##### Work item tracking
- Microsoft ADO **(31374200)**:

#### How I did it
Updated pg_profile.ini for various HW SKUs based on BRCM j2/j2c+ chip

#### How to verify it

<!--
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
-->

- [ ] 201811
- [ ] 201911
- [ ] 202006
- [ ] 202012
- [ ] 202106
- [ ] 202111
- [ ] 202205
- [ ] 202211
- [ ] 202305

#### 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)
…atically (#21859)

#### Why I did it
src/sonic-utilities
```
* 17a7b18b - (HEAD -> 202411, origin/202411) Fix `vnet_route_check` for active and inactive routes, add `--all` option (#3780) (2 days ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Update Broadcom DNX SAI to 12.3 and update kernel drivers
…ation (#21890)

<!--
 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
Fix the issue with the position calculation of the sensors with discrete indexes.

##### Work item tracking
- Microsoft ADO **(number only)**:

#### How I did it
Pass the base position into `create_discrete_thermal` function instead of initializing the position with 1.

#### How to verify it
Run `snmp/test_snmp_phy_entity.py` sonic-mgmt test on the platform with discrete sensors.

<!--
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
-->

- [ ] 201811
- [ ] 201911
- [ ] 202006
- [ ] 202012
- [ ] 202106
- [ ] 202111
- [ ] 202205
- [ ] 202211
- [ ] 202305

#### 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)
@mssonicbld mssonicbld requested a review from lguohan as a code owner March 1, 2025 03:02
@mssonicbld mssonicbld merged commit 615763f into Azure:202412 Mar 1, 2025
4 checks passed
liushilongbuaa pushed a commit that referenced this pull request Mar 25, 2026
…D automatically (#25596)

#### Why I did it
src/sonic-platform-daemons
```
* 39dba74 - (HEAD -> master, origin/master, origin/HEAD) Revert "Remove the SFP thermal data retrieval in thermalctld (#739)" (#745) (25 hours ago) [judyjoseph]
* 41e0505 - Set initial state before config manager task is up (#752) (31 hours ago) [Gagan Punathil Ellath]
* b5f34a0 - Xcvrd Refactor 7/13: Refactor CMIS_STATE_DP_DEINIT logic into handle_cmis_dp_deinit_state (#748) (31 hours ago) [Bobby McGonigle]
* ebb54ed - [xcvrd] Separate VDM basic and statistic observables (#750) (2 days ago) [mihirpat1]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants