Skip to content

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

Merged
mssonicbld merged 4 commits intoAzure:202205from
mssonicbld:sonicbld/202205-merge
Jun 30, 2023
Merged

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

Conversation

@mssonicbld
Copy link
Collaborator

* 9ef61bc6f - (head/202205) revert SAI XGS vertion to 7.1.36.4 (#15661) (2023-06-29) [zitingguo-ms]
* 741235667 - Revert "[202205] Update Broadcom DNX SAI version to 7.1.50.4 (#15561)" (#15650) (2023-06-28) [Tejaswini Chadaga]
* e2d988e45 - [buildsystem] Fix hiredis package version: 0.14.1-1 (#15461) (#15651) (2023-06-28) [Dev Ojha]<br>```

developfast and others added 4 commits June 28, 2023 20:04
* [buildsystem] Fix hiredis package version: 0.14.1-1 (#15461)

- Why I did it
To fix hiredis compilation

- How I did it
Changed package version: 0.14.0-3~bpo9+1 -> 0.14.1-1

- How to verify it
make configure PLATFORM=mellanox
make target/sonic-mellanox.bin

Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>

* Update Makefile

---------

Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>
Co-authored-by: Nazarii Hnydyn <nazariig@nvidia.com>
Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
@mssonicbld mssonicbld requested review from a team, lguohan, qiluo-msft and xumia as code owners June 30, 2023 03:00
@mssonicbld mssonicbld merged commit a004f9d into Azure:202205 Jun 30, 2023
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request Aug 9, 2023
fa8b709 Handled the error case of negative age (Azure#57)
990f5b0 Use github code scanning instead of LGTM (Azure#55)
a7992c5 Install libyang for swss-common. (Azure#50)
244fa86 Update README.md

Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
mssonicbld added a commit that referenced this pull request Mar 5, 2025
…lly (#777)

#### Why I did it
src/sonic-swss
```
* ba962fa - (HEAD -> 202412, origin/202412) [copp]: Use non-zero trap priority for default trap group (#3544) (#50) (20 hours ago) [mssonicbld]
* 513524e - Optimize counter initialization by reducing the number of bulk counter poll calls and communication between swss/sairedis (#49) (24 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Mar 6, 2025
… automatically (#788)

#### Why I did it
src/sonic-platform-common
```
* 8c8f940 - (HEAD -> 202412, origin/202412) [code sync] Merge code from sonic-net/sonic-platform-common:202411 to 202412 (#50) (21 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Apr 29, 2025
…D automatically (#1064)

#### Why I did it
src/sonic-sairedis
```
* 0209ab8 - (HEAD -> 202412, origin/HEAD, origin/202412) [FlexCounter] add support for SRv6 MySID counters (#50) (21 hours ago) [mssonicbld]
* aceb9ed - Move time stamp to time stamp table in counter database to avoid frequently update the counter table (#51) (21 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
prabhataravind pushed a commit that referenced this pull request Jul 7, 2025
…ly (#21970)

#### Why I did it
src/sonic-stp
```
* f3dfb2c - (HEAD -> master, origin/master, origin/HEAD) Mstp Feature - Adding library and DB management APIs (#50) (14 hours ago) [Divya Kumaran Chandralekha]
* 38ac0f1 - MSTP header files (#49) (23 hours ago) [Divya Kumaran Chandralekha]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Jul 8, 2025
…D automatically (#1323)

#### Why I did it
src/sonic-sairedis
```
* c4d152d4 - (HEAD -> 202503, origin/202503) Merge pull request #59 from mssonicbld/sonicbld/202503-merge (23 hours ago) [mssonicbld]
* 8f50be71 - Merge branch '202412' of https://github.com/Azure/sonic-sairedis.msft into 202503 (23 hours ago) [Sonic Automation]
* b36d5641 - (origin/HEAD, origin/202412, 202412) [trim]: Add Packet Trimming Asym DSCP to VS lib (#68) (4 days ago) [mssonicbld]
* 6e75cc6c - [TAM]: Add default SAI_TAM_ATTR_TELEMETRY_OBJECTS_LIST of TAM for saivs create operation (#1614) (#66) (8 days ago) [Ze Gan]
* 0ae8494d - [unittest ]Conditionally enable TestServerSaiMockChannel (#67) (8 days ago) [mssonicbld]
* 12b21f3b - [syncd] Check whether stat_st and tam_telemetry is defined (#1590) (#65) (13 days ago) [Ze Gan]
* 701a114b - [TAM]: Fix TAM notification and vslib implementation (#1606) (#62) (13 days ago) [Ze Gan]
* 6b97f74e - [SAI]: Update SAI to support QUERY_STATS_ST_CAPABILITY and TAM (#1573) (#63) (13 days ago) [Ze Gan]
* f21e12ce - [trim]: Add Packet Trimming Port/Queue stats to VS lib (#60) (4 weeks ago) [Nazarii Hnydyn]
* 9d396448 - Merge pull request #61 from mssonicbld/cherry/msft-202412/1548 (4 weeks ago) [Ze Gan]
|\ 
| failure_prs.log 613654bb - [syncd] Move log set function after api initialize (4 weeks ago) [Sonic Build Admin]
|/ 
* e18530c8 - Update SAI version to 1.16.1 (#54) (8 weeks ago) [mramezani95]
* 3c33c26e - Update codeql runs-on ubuntu version to 22.04 (#56) (8 weeks ago) [mssonicbld]
* 87d6f464 - [trim]: Add Packet Trimming to VS lib (#55) (9 weeks ago) [mssonicbld]
* 80c43090 - Support auto negotiation on the VS platform to avoid error messages. (#52) (10 weeks ago) [mssonicbld]
* 0209ab89 - [FlexCounter] add support for SRv6 MySID counters (#50) (2 months ago) [mssonicbld]
* aceb9ed1 - Move time stamp to time stamp table in counter database to avoid frequently update the counter table (#51) (2 months ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
prabhataravind pushed a commit that referenced this pull request Jul 31, 2025
…HEAD automatically (#1431)

#### Why I did it
src/sonic-swss-common
```
* 584816e - (HEAD -> 202506, origin/202506) Add test case to verify zmq reconnect behaviour (#50) (14 minutes ago) [mssonicbld]
* 866ba38 - Move swss-common/swss-common-testing crates from https://github.com/sonic-net/sonic-dash-ha (#49) (50 minutes ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
r12f pushed a commit that referenced this pull request Aug 2, 2025
… HEAD automatically (#1439)

#### Why I did it
src/sonic-linux-kernel
```
* 9f5eafd - (HEAD -> 202412, origin/HEAD, origin/202412) Ignore table if the EFI memory attributes are corrupt (#51) (62 minutes ago) [mssonicbld]
* c47cdc3 - Merge pull request #50 from mssonicbld/sonicbld/202412-merge (4 hours ago) [mssonicbld]
* a1957f1 - Merge branch '202411' of https://github.com/sonic-net/sonic-linux-kernel into 202412 (4 hours ago) [Sonic Automation]
* 84db3a0 - Fix slave container used for 202411 branch (#504) (15 hours ago) [Saikrishna Arcot]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Aug 3, 2025
… HEAD automatically (#1452)

#### Why I did it
src/sonic-linux-kernel
```
* f60c881 - (HEAD -> 202503, origin/202503) Merge pull request #52 from mssonicbld/sonicbld/202503-merge (23 hours ago) [mssonicbld]
* 5c68aac - Merge branch '202412' of https://github.com/Azure/sonic-linux-kernel.msft into 202503 (23 hours ago) [Sonic Automation]
* 9f5eafd - (origin/HEAD, origin/202412, 202412) Ignore table if the EFI memory attributes are corrupt (#51) (2 days ago) [mssonicbld]
* c47cdc3 - Merge pull request #50 from mssonicbld/sonicbld/202412-merge (2 days ago) [mssonicbld]
* a1957f1 - Merge branch '202411' of https://github.com/sonic-net/sonic-linux-kernel into 202412 (2 days ago) [Sonic Automation]
* 84db3a0 - Fix slave container used for 202411 branch (#504) (2 days ago) [Saikrishna Arcot]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit to mssonicbld/sonic-buildimage-msft that referenced this pull request Sep 12, 2025
… (#23835)

#### Why I did it
src/dhcpmon
```
* 1da5c92 - (HEAD -> 202505, origin/202505) Fix fail to clear counter in some low performance devices (Azure#50) (4 days ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Sep 15, 2025
…test HEAD automatically (#1605)

#### Why I did it
src/sonic-platform-daemons
```
* d96a072 - (HEAD -> 202405, origin/202405) Merge pull request #50 from augusdn/cherry/202405/672 (2 hours ago) [Jianquan Ye]
* 188b1b7 - Cherry-pick PR672 (5 hours ago) [Augustine Lee]
```
#### 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.

4 participants