Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#192

Merged
mssonicbld merged 6 commits intoAzure:202205from
mssonicbld:sonicbld/202205-merge
Dec 19, 2023
Merged

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

Conversation

@mssonicbld
Copy link
Copy Markdown
Collaborator

* 5a4c51aaa - (head/202205) [Dell] S6100 - Update EEPROM API serial_number_str to return service tag instead of serial number (#17440) (#17493) (2023-12-18) [mssonicbld]
* b278f161a - [ci/build]: Upgrade SONiC package versions (#17541) (2023-12-18) [mssonicbld]
* 7294103e6 - [202205][Mellanox] Add mlxtrace to techsupport (#15961) (#15982) (2023-12-18) [Vadym Hlushko]
* 603ed3e48 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#17545) (2023-12-18) [mssonicbld]
* 4d5604a9e - [submodule] Update submodule linkmgrd to the latest HEAD automatically (#17536) (2023-12-18) [mssonicbld]<br>```

mssonicbld and others added 6 commits December 18, 2023 13:53
…y (#17536)

src/linkmgrd

* 6fa4adb - (HEAD -> 202205, origin/202205) [active-standby] Fix `show mux status` inconsistency introduced by orchagent rollback  (Azure#225) (Azure#226) (2 days ago) [Jing Zhang]
…lly (#17545)

src/sonic-swss

* 19affd32 - (HEAD -> 202205, origin/202205) [muxorch][202205] Fixing cache bug in updateRoute logic (#2994) (3 hours ago) [Nikola Dancejic]
* [mlxtrace] Add mft-fwtrace-cfg.deb which contains fwtrace_cfg files for the mlxtrace utility

Signed-off-by: vadymhlushko-mlnx <[email protected]>

* [mlxtrace] Remove mlxtrace support for SPC4

Signed-off-by: vadymhlushko-mlnx <[email protected]>

---------

Signed-off-by: vadymhlushko-mlnx <[email protected]>
…tag instead of serial number (#17440) (#17493)

To modify EEPROM API serial_number_str to return service tag instead of serial number in Dell S6100.
Ref PR: Azure#1239

How I did it
Update EEPROM API serial_number_str to return service tag instead of serial number.

How to verify it
Verify decode-syseeprom -s returns service tag in Dell S6100.

Co-authored-by: Arun Saravanan Balachandran <[email protected]>
@mssonicbld mssonicbld requested review from a team and lguohan as code owners December 19, 2023 03:02
@mssonicbld mssonicbld merged commit 4c32ba1 into Azure:202205 Dec 19, 2023
r12f pushed a commit that referenced this pull request Jun 24, 2025
…AD automatically (#1271)

#### Why I did it
src/sonic-utilities
```
* 63b68057 - (HEAD -> 202412, origin/202412) display proper message with proper errno for kvm. (#192) (9 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Jun 25, 2025
…AD automatically (#1284)

#### Why I did it
src/sonic-utilities
```
* c9d6fc9f - (HEAD -> 202503, origin/202503) Merge pull request #193 from mssonicbld/sonicbld/202503-merge (23 hours ago) [mssonicbld]
* c052761f - Merge branch '202412' of https://github.com/Azure/sonic-utilities.msft into 202503 (23 hours ago) [Sonic Automation]
* 63b68057 - display proper message with proper errno for kvm. (#192) (33 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Jan 14, 2026
…tomatically (#1934)

#### Why I did it
src/sonic-swss
```
* c12e5f25 - (HEAD -> 202503, origin/202503) [action] [PR:3719] [chassis] : LC reboot causing buffer_profile related errors (#192) (6 hours ago) [mssonicbld]
```
#### 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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants