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

[SL-TEMP] Merged 2.5 to 2.6 #350

Merged
merged 10 commits into from
Mar 17, 2025
Merged

[SL-TEMP] Merged 2.5 to 2.6 #350

merged 10 commits into from
Mar 17, 2025

Conversation

jmartinez-silabs
Copy link
Contributor

Merge branch 2.5.-1.4 into 2.6-1.4
manually Fixed conflict for

  • .github/CODEOWNERS
  • .gitmodules
  • matter_support commit sha

Testing

CI to validate build

selissia and others added 10 commits March 6, 2025 20:09
@selissia @silabs-olivierb
@restyled-commits @bzbarsky-apple
[CSA-CP] Cherry pick the OTA fix (CSA PR #37643) (#317)
9dd2016 
Co-authored-by: Olivier Belisle <olbelisl@silabs.com>
Co-authored-by: Restyled.io <commits@restyled.io>
Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
@mkardous-silabs
[CSA-CP][Silabs] Update matter_support remote to use new repository (…
fe7ade5 
…#37363) (#322)
@mkardous-silabs
[SL-TEMP] Update CODEOWNERS (#330)
8012198
@mkardous-silabs @Alami-Amine
[CSA-CP] temporary workaround: keeping pygobject==3.50.0 to avoid dep…
6543569 
…endency i… (#334)

Co-authored-by: Amine Alami <43780877+Alami-Amine@users.noreply.github.com>
@Sarthak-Shaha @restyled-commits
[CSA-CP] remove extern air quality (#335)
c26cd91 
Co-authored-by: Restyled.io <commits@restyled.io>
@jmartinez-silabs @yufengwangca
[CSA-CP] User label max entry limit (#336)
621f8dd 
Co-authored-by: Yufeng Wang <yufengwang@google.com>
@jmartinez-silabs @BoB13-Matter @restyled-commits
[CSA-CP] Fix Null Pointer Dereference in TCP Packet Handling (#337)
ce89c61 
Co-authored-by: BoB13-Matter <bob13wtm@gmail.com>
Co-authored-by: Restyled.io <commits@restyled.io>
@jmartinez-silabs
[CSA-CP] Rename CLUSTER_MASK_ and ATTIBUTE_MASK defines to differenti…
1f1eb53 
…ate with … (#342)
@bhmanda-silabs @mkardous-silabs
[CSA-CP] Fix the secure soc reset issue (#37965) (#344)
3b164b3 
Co-authored-by: Mathieu Kardous <84793247+mkardous-silabs@users.noreply.github.com>
@jmartinez-silabs
Merge remote-tracking branch 'origin/release_2.5-1.4' into merged_2.5…
c52608e 
…_to_2.6
@jmartinez-silabs jmartinez-silabs added the sl-only This TAG indicates that this commit is a silabs-specific commit that cannot be upstream to CSA. label Mar 17, 2025
@jmartinez-silabs jmartinez-silabs requested review from a team as code owners March 17, 2025 14:50
@jmartinez-silabs jmartinez-silabs changed the base branch from main to release_2.6-1.4 March 17, 2025 14:50
@mkardous-silabs
Copy link
Contributor

@jmartinez-silabs Should this be an SL-TEMP with a merge commit?

@jmartinez-silabs jmartinez-silabs added sl-temp This TAG indicates that this commit is silabs-specific that will not be upstream or carried over. and removed sl-only This TAG indicates that this commit is a silabs-specific commit that cannot be upstream to CSA. labels Mar 17, 2025
@jmartinez-silabs jmartinez-silabs changed the title [SL-ONLY] Merged 2.5 to 2.6 [SL-TEMP] Merged 2.5 to 2.6 Mar 17, 2025
@jmartinez-silabs jmartinez-silabs merged commit e19748a into release_2.6-1.4 Mar 17, 2025
53 checks passed
@jmartinez-silabs jmartinez-silabs deleted the merged_2.5_to_2.6 branch March 17, 2025 18:21
@jmartinez-silabs jmartinez-silabs restored the merged_2.5_to_2.6 branch March 17, 2025 18:23
@jmartinez-silabs jmartinez-silabs mentioned this pull request Mar 17, 2025
Merged
@jmartinez-silabs jmartinez-silabs deleted the merged_2.5_to_2.6 branch March 17, 2025 18:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mykrupp mykrupp mykrupp approved these changes

@Sarthak-Shaha Sarthak-Shaha Sarthak-Shaha approved these changes

Assignees
No one assigned
Labels
sl-temp This TAG indicates that this commit is silabs-specific that will not be upstream or carried over.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jmartinez-silabs @mkardous-silabs @mykrupp @Sarthak-Shaha @selissia @bhmanda-silabs