[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#538
Merged
mssonicbld merged 3 commits intoAzure:202305from Jan 22, 2025
Merged
Conversation
Collaborator
mssonicbld
commented
Jan 22, 2025
mssonicbld
commented
<!-- 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 Disable vstest job because sonictest agent pool is failing. To unblock PRs. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it #### 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)
#### Why I did it flashrom recently started failing to build with the below error: ``` Cloning into 'flashrom-0.9.7'... /sonic/src/flashrom/flashrom-0.9.7 /sonic/src/flashrom fatal: 'tags/0.9.7' is not a commit and a branch 'flashrom-src' cannot be created from it ``` Nothing in sonic-buildimage has changed in relation to this so presumably flashrom upstream renamed their tags. ##### Work item tracking #### How I did it This commit just fixes the formatting of the tag name to use the new format. #### How to verify it Build sonic from scratch with no cached packages. #### Which release branch to backport (provide reason below if selected) - [x] 202411 #### Tested branch (Please provide the tested image version) master as of 20250119 #### Description for the changelog flashrom build fix: incorrect tag name #### Link to config_db schema for YANG module changes #### A picture of a cute animal (not mandatory but encouraged) Signed-off-by: Brad House (@bradh352) Signed-off-by: Brad House (@bradh352)
r12f
pushed a commit
that referenced
this pull request
Feb 20, 2025
… automatically (#21728) #### Why I did it src/sonic-platform-common ``` * c735073 - (HEAD -> 202411, origin/202411) [202411][cmis] Fix cmis.get_error_description speed for passive module (#538) (13 hours ago) [Aryeh Feigin] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
that referenced
this pull request
Apr 17, 2025
…est HEAD automatically (#1015) #### Why I did it src/sonic-platform-common ``` * 8ce4e83 - (HEAD -> 202412, origin/202412) Merge pull request #76 from r12f/code-sync-202412 (6 minutes ago) [Riff] * d151d69 - Merge remote-tracking branch 'base/202411' into code-sync-202412 (13 hours ago) [r12f] * f679a67 - Restore optoe page to default 0 for active cables (#550) (6 weeks ago) [mssonicbld] * c735073 - [202411][cmis] Fix cmis.get_error_description speed for passive module (#538) (9 weeks ago) [Aryeh Feigin] * b7e75d8 - Add 800G innolight PNs (#540) (2 months ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
liushilongbuaa
pushed a commit
that referenced
this pull request
Mar 25, 2026
…tomatically (#25632) #### Why I did it src/sonic-linux-kernel ``` * c92aa5c - (HEAD -> master, origin/master, origin/HEAD) Added 6.12 kernel trixie patches for amd-pensando elba platform (#538) (29 hours ago) [Sahil Chaudhari] ``` #### 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.