Skip to content

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

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

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

Conversation

@mssonicbld
Copy link
Collaborator

* a589d610b - (head/202205) Upgrade XGS SAI version to 7.1.50.4 (#15530) (2023-06-22) [zitingguo-ms]
* a1990d4c4 - [Arista][x86_64-arista_7050_qx32] Add Components to platform.json (#15252) (#15585) (2023-06-23) [mssonicbld]
* 41cd22d04 - Updated default ECN settings for T2 chassis (#15541) (2023-06-22) [vmittal-msft]<br>```

vmittal-msft and others added 4 commits June 22, 2023 08:17
* Updated default ECN settings for T2 chassis (#14388)

Why I did it
Update ECN settings for T2 chassis

How I did it
Updated qos config file to load these settings during switch bootup

How to verify it
Verified on line card on T2 chassis

* Fix for test failures

* Test case failures

* test case fix
Update SAI xgs version to 7.1.50.4 to include the following changes:

patch fix from CSP CS00012282080 needed to support speed change from 400g to 100g on chassis linecards.
Backport SONIC-71507 VSQF/VSQE are not created after port creation. JIRA# SONIC-71507
Backport JIRA SONIC-70704 to rel_ocp_sai_7_1. JIRA# SONIC-70704
SID - L3 multicast packet drop due to wrong VFI derivation - SDK-350470
SID - SIGSEGV in linkscan callback delivery - SDK-287578
SID - Repeated VXLAN calls deletes vlan translation action profile SDK-313980
SER - error in IS_TDM_CALENDAR0/1 can cause traffic hit in TH
SID - L2_ENTRY Table Lookups May Miss
[CSP CS00012275452] sai_object_type_get_availability failed with SAI_STATUS_INVALID_PARAMETER

Signed-off-by: zitingguo-ms <[email protected]>
@mssonicbld mssonicbld requested review from a team and lguohan as code owners June 23, 2023 03:01
@mssonicbld mssonicbld merged commit e2f6b66 into Azure:202205 Jun 23, 2023
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request Aug 9, 2023
#### Why I did it

Submodule update for sonic-dbsyncd with following change:
```
0d67faf 2022-07-28 | Replace pyswsssdk with sonic-py-common (Azure#45) [Hua Liu]
265c833 2022-01-11 | Updated the Azure pipeline for Code Coverage (Azure#44) [abdosi]
6548116 2021-04-04 | [ci]: add proper azp [Guohan Lu]
43b9dab 2021-04-04 | [pytest]: add pytest.ini [Guohan Lu]
```

#### How I did it

#### How to verify it

#### 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

#### Description for the changelog
Submodule update for sonic-dbsyncd with following change:
```
0d67faf 2022-07-28 | Replace pyswsssdk with sonic-py-common (Azure#45) [Hua Liu]
265c833 2022-01-11 | Updated the Azure pipeline for Code Coverage (Azure#44) [abdosi]
6548116 2021-04-04 | [ci]: add proper azp [Guohan Lu]
43b9dab 2021-04-04 | [pytest]: add pytest.ini [Guohan Lu]
```

#### A picture of a cute animal (not mandatory but encouraged)

Co-authored-by: liuh-80 <azureuser@liuh-dev-vm-02.5fg3zjdzj2xezlx1yazx5oxkzd.hx.internal.cloudapp.net>
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request Aug 9, 2023
… URL support "not to use cac (#12394)

he" (Azure#45)
* 4f45e3a Update gnmi_cli (Azure#5) (Azure#44)
mssonicbld pushed a commit to mssonicbld/sonic-buildimage-msft that referenced this pull request Dec 22, 2023
sonic-dhcp-relay
5ae186f Yaqiang Zhu Tue Dec 19 12:05:15 2023 -0500 [counter] Clear counter table when init (Azure#45)
40c6877 Jing Zhang Fri Nov 10 12:41:23 2023 -0800 [CodeQL] fix unmet dependency for build-swss-common (Azure#44)

sonic-dhcpmon
7c55e50 StormLiangMS Thu Sep 14 09:57:06 2023 +0800 Merge pull request Azure#13 from jcaiMR/dev/jcai_master_interface_counter
085a087 jcaiMR Mon Sep 11 09:17:03 2023 +0000 refine counting logic
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request May 3, 2024
…ly (#17572)

#### Why I did it
src/dhcprelay
```
* 5ae186f - (HEAD -> master, origin/master, origin/HEAD) [counter] Clear counter table when init (Azure#45) (10 hours ago) [Yaqiang Zhu]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Mar 3, 2025
… automatically (#760)

#### Why I did it
src/sonic-platform-common
```
* 047e12b - (HEAD -> 202412, origin/202412) [code sync] Merge code from sonic-net/sonic-platform-common:202411 to 202412 (#45) (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 17, 2025
…D automatically (#1016)

#### Why I did it
src/sonic-sairedis
```
* 86d1413 - (HEAD -> 202412, origin/HEAD, origin/202412) Merge pull request #45 from r12f/code-sync-202412 (31 minutes ago) [Riff]
* 0fcc968 - Merge remote-tracking branch 'base/202411' into code-sync-202412 (13 hours ago) [r12f]
* 4048483 - Revert "Optimize counter polling interval by making it more accurate (#1457) …" (#1570) (2 weeks ago) [Kumaresh Perumal]
* 420d92f - Update build_and_install_module.sh to match newer Linux kernel version (#1561) (4 weeks ago) [mssonicbld]
* e2d2ca6 - [vslib] SAI_KEY_VS_OPER_SPEED_IS_CONFIGURED_SPEED, SAI_PORT_ATTR_HOST_TX_READY_STATUS support (#1553) (5 weeks ago) [mssonicbld]
* 8c17d4b - Revert "Do not enter vendor SAI critical section for counter polling/clearing operations (#1450)" (#1541) (7 weeks ago) [mssonicbld]
* 3df03e1 - Optimize counter polling interval by making it more accurate (#1457) (#1534) (7 weeks ago) [Stephen Sun]
* d884ff9 - [syncd] Move logSet logGet under mutex to prevent race condition (#1520) (#1538) (8 weeks ago) [Kamil Cudnik]
* ec8b3c3 - Fix pipeline errors related to rsyslogd and libswsscommon installation (#1535) (8 weeks ago) [mssonicbld]
* 6b263b8 - [FC] Support Policer Counter (#1533) (8 weeks ago) [mssonicbld]
* e53489e - [syncd] Update log level for bulk api (#1532) (8 weeks ago) [Jianyue Wu]
* 7ae00e5 - Define bulk chunk size and bulk chunk size per counter ID (#1528) (9 weeks ago) [mssonicbld]
* f35e743 - [nvidia] Skip SAI discovery on ports (#1524) (2 months ago) [mssonicbld]
* bf049ed - Use sonictest pool instead of sonic-common and fix arm64 issue. (#1516) (2 months ago) [mssonicbld]
* ffe371d - [syncd] Support bulk set in INIT_VIEW mode (#1517) (2 months ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Apr 18, 2025
…D automatically (#1025)

#### Why I did it
src/sonic-sairedis
```
* 08c1e34 - (HEAD -> 202412, origin/HEAD, origin/202412) Merge pull request #46 from r12f/user/riffjiang/fix-merge (31 minutes ago) [Riff]
* a49942e - Revert "Merge pull request #45 from r12f/code-sync-202412" (38 minutes ago) [r12f]
```
#### How I did it
#### How to verify it
#### Description for the changelog
r12f pushed a commit that referenced this pull request Jun 14, 2025
…HEAD automatically (#1211)

#### Why I did it
src/sonic-swss-common
```
* 043300f - (HEAD -> 202412, origin/HEAD, origin/202412) Merge pull request #45 from mssonicbld/sonicbld/202412-merge (7 days ago) [mssonicbld]
* 341f077 - Merge branch '202411' of https://github.com/sonic-net/sonic-swss-common into 202412 (7 days ago) [Sonic Automation]
* d38e6d9 - [build] deprecate ubuntu 20.04 agent pool. (#1021) (8 days ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
prabhataravind pushed a commit that referenced this pull request Sep 9, 2025
…test HEAD automatically (#1581)

#### Why I did it
src/sonic-platform-daemons
```
* f3bd628 - (HEAD -> 202506, origin/202506) Merge pull request #45 from mssonicbld/sonicbld/202506-merge (23 hours ago) [mssonicbld]
* a217178 - Merge branch '202505' of https://github.com/sonic-net/sonic-platform-daemons into 202506 (23 hours ago) [Sonic Automation]
* 77c70bd - xcvrd: gate config publish on syncd.restore_count = 1 (instead of system warm-reboot flag) to prevent post-warm-reboot port flaps (#671) (2 days ago) [mssonicbld]
```
#### 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
… (#23654)

#### Why I did it
src/dhcpmon
```
* 1cb6ced - (HEAD -> master, origin/master, origin/HEAD) Update clear_counter_timeout to fix clear counter issue (#45) (19 hours ago) [Yaqiang Zhu]
* 848304e - [build] Update to use libyang3 (#46) (4 days ago) [Yaqiang Zhu]
```
#### 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.

3 participants