manifest: Update manifest to latest zephyr #1366
Closed
Conversation
This file contains 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
tejlmand
force-pushed
the
zephyr_module_path_correction
branch
from
1990a2a
to
3076182
Compare
|
Fix for DESKTOP test failures is in the master. Rebase to get it green here. |
tejlmand
force-pushed
the
zephyr_module_path_correction
branch
2 times, most recently
from
f6db755
to
4b86446
Compare
This commit updates the manifest to use 0adfea4acb72d151237e2d65f89537a598119c25 in zephyr repo. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
force-pushed
the
zephyr_module_path_correction
branch
from
4b86446
to
d6e31a0
Compare
tejlmand
changed the title
|
@SebastianBoe @mbolivar need an approval on this as well, so it can be available to users. |
|
Looks like this needs a rebase. |
SebastianBoe
approved these changes
Nov 1, 2019
|
Be careful so the SHA is not moved back in time when the conflict is resolved. |
|
seems this nrfconnect/sdk-zephyr@943a865 has been merged. |
|
closing, as |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This commit updates the manifest to use nrfconnect/sdk-zephyr@0adfea4 in zephyr repo.
Signed-off-by: Torsten Rasmussen Torsten.Rasmussen@nordicsemi.no