nrfx-8635: Merge collab-nrfx-4.0 to main #1913
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jaz1-nordic
requested review from
magp-nordic,
masz-nordic,
nika-nordic and
nordic-krch
jaz1-nordic
requested review from
a team,
Tschet1,
eriksandgren,
frkv,
leewkb4567,
lopeztel and
tejlmand
as code owners
|
|
magp-nordic
approved these changes
Nov 6, 2025
This was referenced Nov 6, 2025
Contributor
|
Please rebase this PR. |
jaz1-nordic
force-pushed
the
nrfx-8635_merge_collab_to_main
branch
6 times, most recently
from
8341da8 to
3606ded
Compare
jaz1-nordic
force-pushed
the
nrfx-8635_merge_collab_to_main
branch
from
3606ded to
7959d51
Compare
you need to remove mpsl, mpsl: split mpsl_hwres and softdevice_controller commits from this PR. They are already merged to main. |
jaz1-nordic
force-pushed
the
nrfx-8635_merge_collab_to_main
branch
2 times, most recently
from
aa08ab8 to
e5f3d5d
Compare
jaz1-nordic
force-pushed
the
nrfx-8635_merge_collab_to_main
branch
from
e5f3d5d to
a17d71b
Compare
rugeGerritsen
previously requested changes
Nov 25, 2025
Contributor
rugeGerritsen
left a comment
rugeGerritsen
left a comment
There was a problem hiding this comment.
Discussed offline. Changes to MPSL headers should be removed
github-actions
bot
added
the
doc-required
masz-nordic
force-pushed
the
nrfx-8635_merge_collab_to_main
branch
from
5a99f74 to
149b795
Compare
grochu
approved these changes
Nov 26, 2025
masz-nordic
force-pushed
the
nrfx-8635_merge_collab_to_main
branch
3 times, most recently
from
30951f2 to
ada0412
Compare
MDK should not be included directly, but via nrfx.h Signed-off-by: Marcin Szymczyk <[email protected]>
MDK should not be included directly, but via nrfx.h Signed-off-by: Marcin Szymczyk <[email protected]>
MDK should not be included directly, but via nrfx.h Signed-off-by: Marcin Szymczyk <[email protected]>
MDK should not be included directly, but via nrfx.h Signed-off-by: Marcin Szymczyk <[email protected]>
MDK should not be included directly, but via nrfx.h Signed-off-by: Marcin Szymczyk <[email protected]>
It is located in lib now. Signed-off-by: Marcin Szymczyk <[email protected]>
GPPI handles all PPI system and nrfx_ppi, nrfx_dppi, nrfx_ppib are now deprecated. Signed-off-by: Krzysztof Chruściński <[email protected]>
NRFX drivers now return errno codes. Signed-off-by: Michał Stasiak <[email protected]>
CHANGELOG.rst contains the list of changes. Signed-off-by: Michał Grochala <[email protected]>
masz-nordic
force-pushed
the
nrfx-8635_merge_collab_to_main
branch
from
ada0412 to
7264880
Compare
|
masz-nordic
dismissed
rugeGerritsen’s stale review
Changes in mpsl and sdc removed.
e-rk
approved these changes
Nov 28, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
12 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge collab-nrfx-4.0 to main
manifest-pr-skip