Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202405 to 202405#1115

Merged
mssonicbld merged 3 commits intoAzure:202405from
mssonicbld:sonicbld/202405-merge
May 13, 2025
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202405 to 202405#1115
mssonicbld merged 3 commits intoAzure:202405from
mssonicbld:sonicbld/202405-merge

Conversation

@mssonicbld
Copy link
Collaborator

* 53289f8fe - (head/202405) Add symbol link to Mellanox-SN2700 HWSKU (#22562) (2025-05-12) [mssonicbld]
* 3ae3f733d - [submodule] Update submodule sonic-host-services to the latest HEAD automatically (#22570) (2025-05-12) [mssonicbld]<br>```

mssonicbld and others added 3 commits May 12, 2025 19:01
…utomatically (#22570)

#### Why I did it
src/sonic-host-services
```
* 9082af7 - (HEAD -> 202405, origin/202405) [kdump-config] update kdump default config with pre-defined value in /proc/cmdline (installer.conf) (cherry-pick from master to 202405) (Azure#236) (4 days ago) [Marty Y. Lok]
```
#### How I did it
#### How to verify it
#### Description for the changelog
<!--
     Please make sure you've read and understood our contributing guidelines:
     https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

     ** 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 to add a symbol link to Mellanox-SN2700 HWSKU so that we can use the exact same HWSKU name for `x86_64-mlnx_msn2700a1-r0` platform.

##### Work item tracking
- Microsoft ADO **32671789**:

#### How I did it
Make a symbol link under `x86_64-mlnx_msn2700a1-r0` folder.

#### How to verify it
The change is verified by deploying a new HWSKU on a SN2700-A1 platform.
<!--
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.
-->
This PR is to add a symbol link to Mellanox-SN2700 HWSKUs.

#### 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
-->
No config_db change involved.

#### A picture of a cute animal (not mandatory but encouraged)
@mssonicbld mssonicbld requested a review from lguohan as a code owner May 13, 2025 03:02
@mssonicbld mssonicbld merged commit 693f27d into Azure:202405 May 13, 2025
3 checks passed
liushilongbuaa pushed a commit that referenced this pull request Mar 25, 2026
…omatically (#24792)

#### Why I did it
src/sonic-swss-common
```
* 03c6777 - (HEAD -> master, origin/master, origin/HEAD) Opportunistically use a matching kernel version for building the modules (#1138) (2 days ago) [Saikrishna Arcot]
* 41acbf8 - Ensure RedisPipeline dtor not to throw (#1115) (5 days ago) [Qi Luo]
* e8a9592 - Reapply "Fix risky unwrap(), expect(), and casting (#1113)" (#1118) (#1124) (5 days ago) [Qi Luo]
```
#### 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.

1 participant