Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202405 to 202405#510

Merged
mssonicbld merged 4 commits intoAzure:202405from
mssonicbld:sonicbld/202405-merge
Jan 10, 2025
Merged

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

Conversation

@mssonicbld
Copy link
Copy Markdown
Collaborator

* 07ef4e683 - (head/202405) [submodule] Update submodule sonic-linux-kernel to the latest HEAD automatically (#21358) (2025-01-10) [mssonicbld]
* c5948d53f - 202405 add subnet decap yang (#21263) (2025-01-09) [Longxiang Lyu]
* 6021e76cc - Platform DCS-7060DX5-64S misc update (#20323) (#21153) (2025-01-09) [mssonicbld]<br>```

mssonicbld and others added 4 commits January 9, 2025 14:01
Why I did it
This is to add the HWSKU DCS-7060DX5-64S misc update. This is a must have for the platform support. This should get into the master branch as soon as possible and back port to the needed releases.

Work item tracking
Microsoft ADO (number only):
How I did it
Adding additional media, port config settings etc needed for the HWSKU.
This is an updated version of an older PR #19109 for 202305 which is closed. This PR should replace the older PR#19109 and should be cast to all active releases. This PR has the latest chip configuration base on Arista lab setting and the most up to date SI setting for optical transceivers.

How to verify it
We have verified it in house using the sonic mgmt test.
In additional, we have verify all the SI value which match our HW database for optical deployment.
This changes has been verified in Arista lab with 202305 , 202311, 202405 releases.

Co-authored-by: vincentpcng <[email protected]>
* [YANG] Add yang model to `SUBNET_DECAP` table

Signed-off-by: Longxiang Lyu <[email protected]>
…tomatically (#21358)

#### Why I did it
src/sonic-linux-kernel
```
* 7e8ca67 - (HEAD -> 202405, origin/202405) [PCI/ASPM] Revert commit `456d8aa` to avoid kernel panics in `6.1.94` (Azure#448) (Azure#453) (17 hours ago) [kenneth-arista]
```
#### How I did it
#### How to verify it
#### Description for the changelog
@mssonicbld mssonicbld merged commit 6021de0 into Azure:202405 Jan 10, 2025
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request Jan 10, 2025
… automatically (#20669)

#### Why I did it
src/sonic-platform-common
```
* 075da80 - (HEAD -> 202405, origin/202405) Add/modify VDM and Status related cmis fields for onboarding xcvr diagnostic features (Azure#510) (61 minutes ago) [mihirpat1]
```
#### How I did it
#### How to verify it
#### Description for the changelog
yutongzhang-microsoft pushed a commit to yutongzhang-microsoft/sonic-buildimage-msft that referenced this pull request Jan 23, 2025
… automatically (#20670)

#### Why I did it
src/sonic-platform-common
```
* 59babf5 - (HEAD -> master, origin/master, origin/HEAD) Add/modify VDM and Status related cmis fields for onboarding xcvr diagnostic features (Azure#510) (3 hours ago) [mihirpat1]
```
#### 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
…tomatically (#23856)

#### Why I did it
src/sonic-linux-kernel
```
* 4dda3d6 - (HEAD -> 202505, origin/202505) Add upstream fix for bridge link show failure (Azure#510) (50 minutes 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