Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
Sep 4, 2024
Merged

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

merged 3 commits into from
Sep 4, 2024

Conversation

mssonicbld
Copy link
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
@yaqiangz
[202305][isc-dhcp-relay] Add patch to init io obj before creating fd …
94f265b 
…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
@jamesan47
Update cisco-8000.ini (#20117)
48c270d 
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
Merge branch '202305' of https://github.com/sonic-net/sonic-buildimage …
d6c60a9 
…into 202305
@mssonicbld mssonicbld merged commit b570254 into sonic-net:202305 Sep 4, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mssonicbld @yaqiangz @jamesan47