Fix hal_nordic manifest history#4024
Merged
Merged
Conversation
This reverts commit 328e2f2. I'm not sure how it was created, but it does not seem to have followed the process correctly. Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
…ate nrfx 4.2.1" This reverts commit 241d699. In 241d699, we updated hal_nordic in sdk-zephyr with a fromlist from 44fd3d44b15cb75f80a25b4679f91d2787e28664 to 7142bc9c3c94f06e3b520890dde93d363c0e67bf But the fromlist must not have been merged because I find no such equivalent change in upstream Zephyr. What I do find in upstream Zephyr is this sequence: f9799c5 (Sebastian Bøe 2026-04-21 206) revision: c8f0c2b6ecf66b0a4af24b5272d879c305868feb 191f572 (Krzysztof Chruściński 2026-04-16 206) revision: 0424db2d8320cfe417af5675b5bfd2b9a8b43d23 f63ae95 (Sebastian Bøe 2026-04-13 206) revision: af3848538da37360913bc68eeef40f32430b7c52 02b7d68 (Håkon Amundsen 2026-03-27 206) revision: 44fd3d44b15cb75f80a25b4679f91d2787e28664 So from 44f to af3, not from 44f to 714. Since 714 is not in upstream, I can't update hal_nordic without causing a conflict. So I will revert the fromlist, and then fromtree the 4 correct commits. Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
|
The following west manifest projects have changed revision in this Pull Request:
✅ All manifest checks OK Note: This message is automatically posted and updated by the Manifest GitHub Action. |
SebastianBoe
force-pushed
the
fix_commit_message
branch
from
5607636 to
67d365d
Compare
NordicBuilder
added a commit
to NordicBuilder/sdk-nrf
that referenced
this pull request
Apr 27, 2026
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#4024 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
update hal_nordic revision. Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no> (cherry picked from commit f63ae95)
Update hal_nordic with fix in nrfx_gppi helper module. Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no> (cherry picked from commit 191f572)
Update hal_nordic revision. Requires zephyrproject-rtos/hal_nordic#357 Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no> (cherry picked from commit f9799c5)
SebastianBoe
force-pushed
the
fix_commit_message
branch
from
67d365d to
d38a7e8
Compare
NordicBuilder
added a commit
to NordicBuilder/sdk-nrf
that referenced
this pull request
Apr 27, 2026
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#4024 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
nika-nordic
approved these changes
Apr 27, 2026
kl-cruz
approved these changes
Apr 27, 2026
mstasiaknordic
approved these changes
Apr 27, 2026
NordicBuilder
added a commit
to NordicBuilder/sdk-nrf
that referenced
this pull request
Apr 27, 2026
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#4024 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
nordicjm
pushed a commit
to nrfconnect/sdk-nrf
that referenced
this pull request
Apr 27, 2026
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#4024 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 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.
The git history has become a mess.
I have described my analysis of what has happened in 3375423.
This PR attempts to fix the history and also update to the latest hal_nordic with some fromtree commits.