Skip to content

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

Merged
mssonicbld merged 9 commits intoAzure:202205from
mssonicbld:sonicbld/202205-merge
Jun 17, 2023
Merged

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

Conversation

@mssonicbld
Copy link
Collaborator

* d5d674e89 - (head/202205) Revert "Fix for fast/cold-boot: call db_migrator only after old config is loaded (#14933)" (#15464) (#15517) (2023-06-17) [mssonicbld]
* 2d436cc59 - 202205 cast for https://github.com/sonic-net/sonic-buildimage/pull/14992 (#15499) (2023-06-16) [siqbal1986]
* b4dcd1bcb - Create default Vxlan and Vnet configs (#13409) (#15497) (2023-06-16) [Prince Sunny]
* b0f2cb3be - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#15510) (2023-06-16) [mssonicbld]
* 4a38fb568 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#15508) (2023-06-16) [mssonicbld]
* 228689507 - [submodule] Update submodule sonic-sairedis to the latest HEAD automatically (#15506) (2023-06-16) [mssonicbld]
* 6cd8ae36f - [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#15505) (2023-06-16) [mssonicbld]
* 118f14dc6 - [submodule] Update submodule linkmgrd to the latest HEAD automatically (#15503) (2023-06-16) [mssonicbld]<br>```

mssonicbld and others added 9 commits June 16, 2023 08:30
…y (#15503)

src/linkmgrd

* 9aebd5a - (HEAD -> 202205, origin/202205) Re-handle pre-init mux config notification after state machine init (Azure#202) (10 hours ago) [Longxiang Lyu]
…D automatically (#15505)

src/sonic-platform-daemons

* 78db08e - (HEAD -> 202205, origin/202205) Separate periodic v/s fixed EEPROM reads between threads and optimize xcvrd boot-up time (Azure#360) (5 hours ago) [mihirpat1]
* 1a672b0 - [ycable] change logging level for stop main loop to NOTICE from ERR (Azure#376) (9 hours ago) [vdahiya12]
…tically (#15506)

src/sonic-sairedis

* ec81223 - (HEAD -> 202205, origin/202205) [syncd] Add pre match logic for acl entry (Azure#1240) (10 hours ago) [Kamil Cudnik]
* 2966e58 - Fix pipeline issue caused by urllib3 v2 (10 hours ago) [Liu Shilong]
…lly (#15508)

src/sonic-swss

* 444e3be - (HEAD -> 202205, origin/202205) [subinterface]: Fix admin state handling. (#2806) (10 hours ago) [Nazarii Hnydyn]
* 9690c5a - [portsorch]: Enhancing SWSS OA logs to capture host_tx_ready change events (#2822) (10 hours ago) [mihirpat1]
…atically (#15510)

src/sonic-utilities

* 43c85ef5 - (HEAD -> 202205, origin/202205) [dhcp-relay] Fix dhcp6relay counter issue (#2866) (10 hours ago) [Yaqiang Zhu]
* e0333b5c - Revert "[config]config reload should generate sysinfo if missing (#2778)" (#2865) (10 hours ago) [jingwenxie]
* e7eac6bf - [config] Generate sysinfo in single asic (#2856) (10 hours ago) [jingwenxie]
* e42291bb - [config] Generate sysinfo as needed when override config (#2836) (10 hours ago) [jingwenxie]
* Create default Vxlan and Vnet configs for ToRs with Appliance Resource type
Why I did it
CP of orignal PR #14992 which failed automatic CP.

Work item tracking
Microsoft ADO (number only):21695894
@mssonicbld mssonicbld requested review from a team and lguohan as code owners June 17, 2023 03:01
@mssonicbld mssonicbld merged commit 60218a8 into Azure:202205 Jun 17, 2023
mssonicbld added a commit that referenced this pull request Feb 19, 2025
…lly (#639)

#### Why I did it
src/sonic-swss
```
* 4baf54f - (HEAD -> 202412, origin/202412) SRv6: add dscp_mode configuration for MySID entry (#38) (6 hours ago) [mssonicbld]
* ff491ba - [SRv6] Add support for SRv6 VPN (#37) (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 Feb 25, 2025
… automatically (#693)

#### Why I did it
src/sonic-platform-common
```
* 16bb721 - (HEAD -> 202412, origin/202412) [code sync] Merge code from sonic-net/sonic-platform-common:202411 to 202412 (#37) (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 15, 2025
…tomatically (#887)

#### Why I did it
src/sonic-linux-kernel
```
* 26b1192 - (HEAD -> 202412, origin/HEAD, origin/202412) [code sync] Merge code from sonic-net/sonic-linux-kernel:202411 to 202412 (#37) (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
…omatically (#909)

#### Why I did it
src/sonic-swss-common
```
* c55ee84 - (HEAD -> 202412, origin/HEAD, origin/202412) [FC] remove FLEX_COUNTER_DELAY_STATUS_FIELD (#982) (#37) (22 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 19, 2025
…tically (#926)

#### Why I did it
src/sonic-sairedis
```
* a2ee5d6 - (HEAD -> 202412, origin/HEAD, origin/202412) Update build_and_install_module.sh to match newer Linux kernel version (#37) (11 seconds 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
… (#22170)

#### Why I did it
src/dhcpmon
```
* fb808e0 - (HEAD -> master, origin/master, origin/HEAD) Update key in COUNTERS_DB (#37) (4 days ago) [Yaqiang Zhu]
```
#### How I did it
#### How to verify it
#### Description for the changelog
prabhataravind pushed a commit that referenced this pull request Jul 7, 2025
…tically (#22376)

#### Why I did it
src/sonic-dash-api
```
* 817c0f4 - (HEAD -> master, origin/master, origin/HEAD) Add attributes for FNIC (#37) (27 hours ago) [Lawrence Lee]
```
#### How I did it
#### How to verify it
#### Description for the changelog
prabhataravind pushed a commit that referenced this pull request Aug 13, 2025
…test HEAD automatically (#1502)

#### Why I did it
src/sonic-platform-daemons
```
* 54142e1 - (HEAD -> 202506, origin/202506) Merge pull request #37 from mssonicbld/sonicbld/202506-merge (2 hours ago) [mssonicbld]
* 2d23a96 - Merge branch '202505' of https://github.com/sonic-net/sonic-platform-daemons into 202506 (2 hours ago) [Sonic Automation]
* ec9666a - [Smartswitch] Fix chassisd to prevent crashes on smartswitch (#660) (23 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
liushilongbuaa pushed a commit that referenced this pull request Mar 25, 2026
…tomatically (#25498)

#### Why I did it
src/sonic-platform-pde
```
* 6e36a87 - (HEAD -> master, origin/master, origin/HEAD) Merge pull request #37 from rustiqly/add-copilot-instructions (11 hours ago) [rustiqly]
* 4fd3ff9 - Add .github/copilot-instructions.md for AI-assisted development (3 days ago) [Rustiqly]
```
#### 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