Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#446

Merged
mssonicbld merged 3 commits intoAzure:202305from
mssonicbld:sonicbld/202305-merge
Sep 4, 2024
Merged

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

Conversation

@mssonicbld
Copy link
Copy Markdown
Collaborator

* 48c270d8b - (head/202305) Update cisco-8000.ini (#20117) (2024-09-04) [James An]
* 94f265bac - [202305][isc-dhcp-relay] Add patch to init io obj before creating fd watch (#20028) (2024-09-04) [Yaqiang Zhu]<br>```

yaqiangz and others added 3 commits September 4, 2024 08:52
…watch (#20028)

Why I did it
Manually cherry-pick and resolve conflict of this PR: #20021
In the scenario dhcrelay startup with DHCP packets come, there is possibility that dhcrelay try to attach FD wather to I/O handler before I/O handler initiated, which cause dhcrelay wouldn't read any packets from FD. This PR is to fix that issue.

Work item tracking
Microsoft ADO (number only): 29209311
How I did it
Move initialization part to place before attach FD watcher
Add log when it fails to attach FD watcher
How to verify it
Build image and run tests
Release notes for Cisco 8111-32EH-O, 8102-64H-O and 8101-32FH:
• [8111] IOFPGA version upgrade to 1.8 for fixing transceiver EEPROM access issue
• Platform workaround for PSU Status "Not Ok"​

Update platform version to 202305.1.0.17
• Skipping 202305.1.0.16 due to it missing a key fix.
@mssonicbld mssonicbld merged commit b570254 into Azure:202305 Sep 4, 2024
prabhataravind pushed a commit that referenced this pull request Jul 7, 2025
…tomatically (#21011)

#### Why I did it
src/sonic-linux-kernel
```
* c281fc9 - (HEAD -> master, origin/test_202411_20, origin/test_202411_100, origin/master, origin/kperumal_202411, origin/HEAD, origin/202411) Integrate HW-MGMT 7.0040.2000 Changes (#446) (4 days ago) [DavidZagury]
```
#### How I did it
#### How to verify it
#### Description for the changelog
prabhataravind pushed a commit that referenced this pull request Jul 7, 2025
…D automatically (#22415)

#### Why I did it
src/sonic-platform-daemons
```
* a86dd89 - (HEAD -> master, origin/master, origin/HEAD) Store reboot_cause history files with json extension. Fix for #22072 (#603) (3 days ago) [rameshraghupathy]
* 6dfb552 - Refactor ledd daemon & fix high CPU usage due to unexpected socket close (#548) (3 days ago) [Prince George]
* d36e830 - Change PSU key to use get_name API instead of index (#446) (4 days ago) [Gregory Boudreau]
```
#### 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