[code sync] Merge code from sonic-net/sonic-buildimage:202411 to 202412#708
Merged
mssonicbld merged 3 commits intoAzure:202412from Feb 26, 2025
Merged
Conversation
Collaborator
mssonicbld
commented
Feb 26, 2025
mssonicbld
commented
…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)
mssonicbld
added a commit
to mssonicbld/sonic-buildimage-msft
that referenced
this pull request
Nov 28, 2025
…D automatically (#24554) #### Why I did it src/sonic-platform-daemons ``` * 3ba2423 - (HEAD -> 202505, origin/202505) [202505] [sff-mgr] Disable SFF manager support for all CMIS transceivers (Azure#710) (Azure#712) (3 days ago) [mihirpat1] * f9e15e3 - [202505] Re-arm timer for CMIS Datapath pre-init check (Azure#707) (Azure#708) (9 days ago) [mihirpat1] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
that referenced
this pull request
Dec 10, 2025
…test HEAD automatically (#1820) #### Why I did it src/sonic-platform-daemons ``` * 63625ac - (HEAD -> 202506, origin/202506) Merge pull request #56 from mssonicbld/sonicbld/202506-merge (23 hours ago) [mssonicbld] * 4aefce8 - Merge branch '202505' of https://github.com/sonic-net/sonic-platform-daemons into 202506 (23 hours ago) [Sonic Automation] * f9e15e3 - [202505] Re-arm timer for CMIS Datapath pre-init check (#707) (#708) (24 hours ago) [mihirpat1] ``` #### How I did it #### How to verify it #### Description for the changelog
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
1 participant
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.