[code sync] Merge code from sonic-net/sonic-buildimage:202505 to 202506#1965
Open
mssonicbld wants to merge 11 commits intoAzure:202506from
Open
[code sync] Merge code from sonic-net/sonic-buildimage:202505 to 202506#1965mssonicbld wants to merge 11 commits intoAzure:202506from
mssonicbld wants to merge 11 commits intoAzure:202506from
Conversation
Collaborator
mssonicbld
commented
Jan 31, 2026
mssonicbld
commented
…ically (#25242) #### Why I did it src/sonic-restapi ``` * 66d1605 - (HEAD -> 202505, origin/202505) [Pfx_len] Extend prefix length for routes and advertisement (Azure#181) (9 days ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
Collaborator
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
ab53810 to
24bc6ce
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. |
…tomatically (#25239) #### Why I did it src/sonic-linux-kernel ``` * dbb27c6 - (HEAD -> 202505, origin/202505) update docker slave name (Azure#527) (4 days ago) [yijingyan2] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
24bc6ce to
d46757f
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
d46757f to
2b5fa68
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. |
…omatically (#25317) #### Why I did it src/sonic-swss-common ``` * 084b495 - (HEAD -> 202505, origin/202505) Create a new PORT_PHY_ATTR table (Azure#1145) (48 minutes ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
2b5fa68 to
9746b3c
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
9746b3c to
42baede
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
42baede to
4730eb1
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
4730eb1 to
559df31
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
559df31 to
1596e2b
Compare
Collaborator
Author
|
/azp run |
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
61e8c5f to
283a462
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
283a462 to
34c8a14
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
34c8a14 to
6c807a3
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 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 On 5640 full topology testbed, during system boots up, 457(456 Ethernet + eth0) interfaces are booting up, lldpd is initializing too. when lldpd initializing, it will send RTM_GETLINK dump to get all interfaces, but during this period, some new interfaces are boots up, lldpd subscribes async notification of netlink update(`levent_iface_subscribe`). Since queries and changes are using same `sokcet cfg->g_netlink->nl_socket,` previous `RTM_GETLINK` dump interfaces(`netlink_recv RTM_GETLINK`) is impacted by the new RTM_NEWLINK messages handling process(`netlink_change_cb`). About 200+ interfaces are missing in lldp neighbor. Only 200+ interfaces exist which have RTM_NEWLINK arrived after lldpd initialization. - Phenomenon: 1. Incorrect Chassis ID - Chassis ID being incorrect, should be mac but show hostname instead a. Fail to find eth0 and fallback to hostname. WARNING lldp#lldpcli[29]: cannot find port eth0 1. lldpcli config failure - The port is up already, but later lldp cannot find the port, hence missing port up events and never be able to recover. The symptom will be both sides are missing lldp entries. a. <11>2026-02-05T04:18:42.052245+00:00 ATL21-0101-0014-12BT0 ERR lldp#lldpmgrd[38]: Command failed '['lldpcli', 'configure', 'ports', 'Ethernet501', 'lldp', 'portidsubtype', 'local', 'etp63f', 'description', 'ATL210101580129:A1.PORT8']': 2026-02-05T04:18:42 [WARN/lldpctl] cannot find port Ethernet501#012 - command was failed 6 times, disabling retry ##### Work item tracking - Microsoft ADO **36610002**: #### How I did it now sonic is using lldpd 1.0.16. There is a known issue in lldpd community: In some cases lldpd cannot get all interfaces · Issue Azure#611 · lldpd/lldpd And it's fixed, but no tag for 1.0.16 :daemon/netlink: use a different socket for changes and queries · lldpd/lldpd@88fe3fa Add this commit as a new patch for sonic to fix this issue. #### 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. --> config reload can repro this issue easily on 5640 full topology testbed. Try run "config reload" and verify if all lldp neighbors are up. #### 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: --> <!-- 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 (#25483) #### Why I did it src/sonic-utilities ``` * 7511bf2f - (HEAD -> 202505, origin/202505) Added counterpoll CLI support (#4246) (4 days ago) [Dhanasekar Rathinavel] ``` #### How I did it #### How to verify it #### Description for the changelog
…tically (#25480) #### Why I did it src/sonic-sairedis ``` * 14db8ad4 - (HEAD -> 202505, origin/202505) Add PORT_SERDES_ATTR flex counter support (Azure#1702) (4 days ago) [Dhanasekar Rathinavel] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
6c807a3 to
fb8c0dc
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. |
…omatically (#25482) #### Why I did it src/sonic-swss-common ``` * c1da74e - (HEAD -> 202505, origin/202505) Merge pull request Azure#1149 from yejianquan/jianquanye/202505 (5 days ago) [Jianquan Ye] * 904569c - [202505] Temporarily disable test to get a successful build (5 days ago) [Jianquan Ye] ``` #### How I did it #### How to verify it #### Description for the changelog
…lly (#25481) #### Why I did it src/sonic-swss ``` * 139056bf - (HEAD -> 202505, origin/202505) Add PORT_SERDES_ATTR flex counter support in orchagent (#4017) (4 days ago) [Dhanasekar Rathinavel] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
fb8c0dc to
e283c3d
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
e283c3d to
647b4ed
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
647b4ed to
11d5705
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
11d5705 to
83d99e3
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. |
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.