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.

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

[SL-TEMP] Merge 2.5 to 2.6 (20-03-25) #364

Open
wants to merge 5 commits into
base: release_2.6-1.4
Choose a base branch
from

Conversation

jmartinez-silabs
Copy link
Contributor

Merging 2.5 to our 2.6 branch.
Manual conflict fix : matter_support to point to release_2.6-14 branch with include update of sisdk wifisdk support
SiliconLabsSoftware/matter_support#92

Testing

CI + local build and commissioning of 4187c

@jmartinez-silabs jmartinez-silabs added changing-submodules-on-purpose sl-temp This TAG indicates that this commit is silabs-specific that will not be upstream or carried over. labels Mar 20, 2025
@jmartinez-silabs jmartinez-silabs requested a review from a team as a code owner March 20, 2025 19:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changing-submodules-on-purpose sl-temp This TAG indicates that this commit is silabs-specific that will not be upstream or carried over.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants