Skip to content

Manifest update #71

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
Merged
merged 1 commit into from
Apr 24, 2025
Merged

Manifest update #71

merged 1 commit into from
Apr 24, 2025

Conversation

@eivindj-nordic
Copy link
Contributor

@eivindj-nordic eivindj-nordic commented Apr 7, 2025 •
edited
Loading

@eivindj-nordic eivindj-nordic self-assigned this Apr 7, 2025
@eivindj-nordic eivindj-nordic requested a review from lemrey as a code owner April 7, 2025 07:58
@lemrey
Copy link
Contributor

lemrey commented Apr 7, 2025

Can we get one commit here, with just the manifest update? Then we can rebase the other PRs and get them merged.

@eivindj-nordic
Copy link
Contributor Author

eivindj-nordic commented Apr 7, 2025

Done.

@lemrey
Copy link
Contributor

lemrey commented Apr 15, 2025

Could we also include the commit needed to fix this issue ?

@anhmolt anhmolt mentioned this pull request Apr 22, 2025
Closed
@eivindj-nordic
Copy link
Contributor Author

eivindj-nordic commented Apr 22, 2025

Could we also include the commit needed to fix this issue ?

Fix is merged to sdk-zephyr and will be part of the manifest when this is ready.

MirkoCovizzi
MirkoCovizzi reviewed Apr 23, 2025
View reviewed changes
Copy link
Contributor

@MirkoCovizzi MirkoCovizzi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you make a separate commit for the header file? So that the manifest update commit updates only the manifest.

@eivindj-nordic
Copy link
Contributor Author

eivindj-nordic commented Apr 23, 2025

Can you make a separate commit for the header file? So that the manifest update commit updates only the manifest.

The header update is required for the manifest update, so they should be in the same commit I think.

@eivindj-nordic
manifest: update sdk-nrf with changes for sdk-zephyr
5aabc9a 
Update manifest to bring in changes required for the nRF52840 used
for development.
Adds an empty nrf_sd_def.h file for the S115 SoftDevice for compilation.

Signed-off-by: Eivind Jølsgard <[email protected]>
@anhmolt
Copy link
Contributor

anhmolt commented Apr 23, 2025

Could we also include the commit needed to fix this issue ?

Fix is merged to sdk-zephyr and will be part of the manifest when this is ready.

Did a check and can confirm that changes introduced with nrfconnect/sdk-nrf#21031 is part of the updated sdk-nrf revision 42f0799.

@lemrey
Copy link
Contributor

lemrey commented Apr 24, 2025

@eivindj-nordic can you please remind me why did we need the header file again?

@lemrey
Copy link
Contributor

lemrey commented Apr 24, 2025

Nevermind, I just checked the commit

@lemrey lemrey merged commit 4f0e79b into nrfconnect:main Apr 24, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MirkoCovizzi MirkoCovizzi MirkoCovizzi approved these changes

@anhmolt anhmolt anhmolt approved these changes

@lemrey lemrey Awaiting requested review from lemrey

Assignees

@eivindj-nordic eivindj-nordic

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@eivindj-nordic @lemrey @anhmolt @MirkoCovizzi