Skip to content

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

Merged
mssonicbld merged 3 commits intoAzure:202205from
mssonicbld:sonicbld/202205-merge
Jun 20, 2023
Merged

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

Conversation

@mssonicbld
Copy link
Collaborator

@mssonicbld mssonicbld commented Jun 20, 2023 

* 7b13065e7 - (head/202205) [202211][FRR][CVE] Add FRR patches to fix CVEs: CVE-2022-43681 CVE-2022-40318… (#15263) (#15537) (2023-06-19) [Ying Xie]
* d935f430b - [mux] Integrate `linkmgrd` with swss logger (#15392) (#15539) (2023-06-20) [mssonicbld]<br>```

mssonicbld and others added 3 commits June 20, 2023 09:08
@mssonicbld
[mux] Integrate linkmgrd with swss logger (#15392) (#15539)
d935f43
@yxieca @DavidZagury
[202211][FRR][CVE] Add FRR patches to fix CVEs: CVE-2022-43681 CVE-20…
7b13065 
…22-40318… (#15263) (#15537)

… CVE-2022-40302

Add patches from PRs
FRRouting/frr#12043
FRRouting/frr#12247

#### Why I did it
To fix CVEs GHSA-x7mf-v6gh-vm4g GHSA-9rqq-99cf-35g5 GHSA-j7hm-p94x-q9pw

##### Work item tracking
- Microsoft ADO **(number only)**: 23268946

#### How I did it
Added patches from the FRR fix PRs

Co-authored-by: DavidZagury <32644413+DavidZagury@users.noreply.github.com>
@mssonicbld
Merge branch '202205' of https://github.com/sonic-net/sonic-buildimage …
24c14b6 
…into 202205
@mssonicbld mssonicbld requested a review from lguohan as a code owner June 20, 2023 03:01
@mssonicbld mssonicbld merged commit 119820c into Azure:202205 Jun 20, 2023
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request Jul 5, 2023
@xumia @mssonicbld
[FIPS] Upgrade Open-SymCrypt version to 0.6 (#13461)
70f763a 
Why I did it
[FIPS] Upgrade Open-SymCrypt version to 0.6

Improve the SymCrypt performance
Support to download the debug packages from storage account in version 0.6.
How I did it
Upgrade to symcrypt-openssl from version 0.4 to version 0.6

Changes in https://github.com/sonic-net/sonic-fips:
0c29b23 Upgrade the submodules: SymCrypt and SymCrypt-OpenSSL Azure#40
80022f3 Fix the ARM64 build failure
2e76a3d Disable the unsupported tests

Other changes will be added as well:
55b8e0a Merge pull request Azure#35 from xumia/change-license
120c1a7 Upgrade SymCrypt and SymCrypt-OpenSSL
2f9c084 Merge pull request Azure#39 from liuh-80/dev/liuh/update-openssh-version
a3be6c5 Revert openssh version
e02fa1e Update fips version

How to verify it
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request Aug 9, 2023
@xumia
[FIPS] Upgrade Open-SymCrypt version to 0.6 (#13461)
77745f5 
Why I did it
[FIPS] Upgrade Open-SymCrypt version to 0.6

Improve the SymCrypt performance
Support to download the debug packages from storage account in version 0.6.
How I did it
Upgrade to symcrypt-openssl from version 0.4 to version 0.6

Changes in https://github.com/sonic-net/sonic-fips:
0c29b23 Upgrade the submodules: SymCrypt and SymCrypt-OpenSSL Azure#40
80022f3 Fix the ARM64 build failure
2e76a3d Disable the unsupported tests

Other changes will be added as well:
55b8e0a Merge pull request Azure#35 from xumia/change-license
120c1a7 Upgrade SymCrypt and SymCrypt-OpenSSL
2f9c084 Merge pull request Azure#39 from liuh-80/dev/liuh/update-openssh-version
a3be6c5 Revert openssh version
e02fa1e Update fips version

How to verify it
liushilongbuaa pushed a commit that referenced this pull request Nov 17, 2023
@vivekrnv
[submodule] Update sonic-dhcp-relay submodule (#16942)
3472895 
Why I did it
Update the submodule to include the following fixes

2b33d76 dhcpv6 per interface counter support 
6a6ce24 fix dhcpv6 relay dual tor source interface selection issue 
c36b8e3 [actions] Support Semgrep by Github Actions (#39)
Work item tracking
Microsoft ADO (number only):
How I did it
How to verify it
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request May 3, 2024
@mssonicbld
[submodule] Update submodule dhcprelay to the latest HEAD automatical…
076dae8 
…ly (#15545)

#### Why I did it
src/dhcprelay
```
* c36b8e3 - (HEAD -> master, origin/master, origin/HEAD) [actions] Support Semgrep by Github Actions (Azure#39) (7 hours ago) [Mai Bui]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Feb 27, 2025
@mssonicbld
[submodule] Update submodule sonic-platform-common to the latest HEAD…
1ffd692 
… automatically (#712)

#### Why I did it
src/sonic-platform-common
```
* d0ea66e - (HEAD -> 202412, origin/202412) [code sync] Merge code from sonic-net/sonic-platform-common:202411 to 202412 (#39) (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 Mar 17, 2025
@mssonicbld
[submodule] Update submodule sonic-linux-kernel to the latest HEAD au…
dbd0ad4 
…tomatically (#908)

#### Why I did it
src/sonic-linux-kernel
```
* d237b0f - (HEAD -> 202412, origin/HEAD, origin/202412) [code sync] Merge code from sonic-net/sonic-linux-kernel:202411 to 202412 (#39) (22 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
r12f added a commit that referenced this pull request Mar 28, 2025
@r12f
[submodule][202412] Update submodule sonic-sairedis to the latest HEA…
8cc7f55 
…D automatically (#954)

#### Why I did it
src/sonic-sairedis
```
* a41de7a - (HEAD -> 202412, origin/HEAD, origin/202412) Enhance the logic to check capability of bulk counter poll (#39) (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 Apr 12, 2025
@mssonicbld
[submodule][202412] Update submodule sonic-swss-common to the latest …
631f20f 
…HEAD automatically (#987)

#### Why I did it
src/sonic-swss-common
```
* f277b72 - (HEAD -> 202412, origin/HEAD, origin/202412) [consumer_table_pops]: Support Stats ST Capability query (#39) (23 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Aug 27, 2025
@mssonicbld
[submodule][202503] Update submodule sonic-platform-daemons to the la…
c762fd3 
…test HEAD automatically (#1555)

#### Why I did it
src/sonic-platform-daemons
```
* b58ba5f - (HEAD -> 202503, origin/202503) [xcvrd] Create TRANSCEIVER_FIRMWARE_INFO table for all subports (#39) (3 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Pterosaur pushed a commit that referenced this pull request Sep 12, 2025
@mssonicbld
[submodule][202412] Update submodule sonic-gnmi to the latest HEAD au…
75c02c0 
…tomatically (#1600)

#### Why I did it
src/sonic-gnmi
```
*   64e8539 - (HEAD -> 202412, origin/202412) Merge pull request #97 from Azure/202412-dev (4 hours ago) [Zain Budhwani]
|\  
| * 0de6456 - Adapt to the new usages of arguments (#93) (6 hours ago) [Changrong Wu]
| * 0be3a77 - Remove redundant helper function toString from show_common.go (#86) (23 hours ago) [gnemuw]
| * ff54cad - Fetch arguments from path and supply getters with parsed arguments (#82) (25 hours ago) [Zain Budhwani]
| * 14660a2 - Add `show dropcounters config` (#79) (33 hours ago) [Changrong Wu]
| * 1b7b835 - Added telemetry support for the 'show queue watermark' command. (#72) (5 days ago) [mramezani95]
| * 417ebe5 - interaces description implementation (#69) (6 days ago) [Vijay Sharma]
| * d3140d8 - Implement 'show ipv6 route' command (#64) (6 days ago) [gnemuw]
| * a715f58 - Add show services (#74) (7 days ago) [Zhaoyang Zhang]
| * fe4ab1c - Fix the show headroom_pool typo (#76) (7 days ago) [Guoqiang Yuan]
| * 0277718 - Add show interface naming_mode (#73) (7 days ago) [axin]
| * 03519fe - Add show interface neighbor expected (#54) (7 days ago) [jiayuj2021]
| * f29223a - Add 'show ipv6 fib' command (#67) (7 days ago) [Guoqiang Yuan]
| * 8ae677e - Add SHOW implementation for processes (#63) (8 days ago) [yiliu4]
| * 61927f9 - [202412] Add support of 'show ipv6 link-local-mode' command (#65) (8 days ago) [cgangx]
| * 4dca30c - Add show interface flap support (#66) (8 days ago) [axin]
| * 18c276b - Add show system memory (#57) (8 days ago) [Changrong Wu]
| * 00cc010 - Add support for show interface status (#32) (8 days ago) [Changrong Wu]
| * 941b3a2 - Minor changes from VLAN Brief PR Comments (#68) (8 days ago) [Vijay Sharma]
| * af89dec - show uptime (#39) (9 days ago) [Vijay Sharma]
| * 718ffd7 - Add show ipv6 bgp network (#61) (9 days ago) [Zhaoyang Zhang]
| * 8346e29 - [202412] Add support for 'show ipv6 bgp neighbors (#58) (9 days ago) [zitingguo-ms]
| * aec577c - Add implementation for show lldp neighbors (#56) (10 days ago) [nanali-msft]
| * b561228 - Add show dropcounters counts / capabilities (#40) (13 days ago) [jiayuj2021]
| * 16d6ccc - Add support for dev branches in CodeQL analysis (13 days ago) [Zain Budhwani]
* 8e41780 - Revert "Sync 202412 dev with 202412 (#94)" (#96) (4 hours ago) [Zain Budhwani]
* c5b5383 - Sync 202412 dev with 202412 (#94) (5 hours ago) [Zain Budhwani]
```
#### How I did it
#### How to verify it
#### Description for the changelog
bingwang-ms pushed a commit that referenced this pull request Jan 16, 2026
@mssonicbld
[submodule] Update submodule dhcpmon to the latest HEAD automatically…
a7b3bf5 
… (#22652)

#### Why I did it
src/dhcpmon
```
* c7f2169 - (HEAD -> master, origin/master, origin/HEAD) Add support for clear per-interface counter (#39) (19 hours ago) [Yaqiang Zhu]
* ee55c11 - [build] Update to ubuntu 24.04 in build pipeline (#40) (3 days ago) [Yaqiang Zhu]
```
#### How I did it
#### How to verify it
#### Description for the changelog
bingwang-ms pushed a commit that referenced this pull request Jan 16, 2026
@mssonicbld
[submodule] Update submodule sonic-dash-api to the latest HEAD automa…
072bad1 
…tically (#23133)

#### Why I did it
src/sonic-dash-api
```
* 2ed8ff6 - (HEAD -> master, origin/master, origin/HEAD) Add version fields to vnet and acl group (#39) (4 hours ago) [prabhataravind]
```
#### 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

Reviewers

@lguohan lguohan Awaiting requested review from lguohan lguohan is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@mssonicbld @yxieca