pm_layered: make sure no conflict for pm_set_lowest exists#7863
Merged
miri64 merged 1 commit intoRIOT-OS:masterfrom Oct 26, 2017
Merged
Conversation
haukepetersen
added
Process: needs backport
Contributor
|
Looks good, will test in the next 30min. |
haukepetersen
approved these changes
Oct 26, 2017
Contributor
haukepetersen
left a comment
haukepetersen
left a comment
There was a problem hiding this comment.
Works as expected: ACK
haukepetersen
added
the
CI: ready for build
Member
|
Please provide a backport to the 2017.10-branch. |
Member
Author
|
@miri64 how? |
Member
git fetch upstream # or what ever RIOT-OS/RIOT is called on your machine
git checkout -b 2017.10/pm_fix_pm_layered_conflict_set_lowest pm_fix_pm_layered_conflict_set_lowest
git rebase -i upstream/2017.10-branch
git push -u
# create a PR titled the same as this one with `[2017.10 backport]` appended |
Member
|
Backport provided in #7874. |
miri64
removed
the
Process: needs backport
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
4 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.
As discussed in #7726 we always want to use pm_set_lowest from pm_layered if pm_layered is used and not be using the one from periph_common.
IMO this should be back ported to the 2017.10 release because it will result in potential conflicts.