Skip to content

[2017.10 backport] pm_layered: make sure no conflict for pm_set_lowest exists#7874

Merged
haukepetersen merged 1 commit intoRIOT-OS:2017.10-branchfrom
roberthartung:2017.10/pm_fix_pm_layered_conflict_set_lowest
Oct 27, 2017
Merged

[2017.10 backport] pm_layered: make sure no conflict for pm_set_lowest exists#7874
haukepetersen merged 1 commit intoRIOT-OS:2017.10-branchfrom
roberthartung:2017.10/pm_fix_pm_layered_conflict_set_lowest

Conversation

@roberthartung
Copy link
Copy Markdown
Member

@roberthartung roberthartung commented Oct 26, 2017

Backport of #7863

@miri64

@roberthartung
Copy link
Copy Markdown
Member Author

roberthartung commented Oct 26, 2017

I think I branched off master and not 2017.10 :/

@miri64 miri64 changed the base branch from master to 2017.10-branch October 26, 2017 14:18
@miri64
Copy link
Copy Markdown
Member

miri64 commented Oct 26, 2017

Mh and did not set the correct base branch :-/.

@miri64
Copy link
Copy Markdown
Member

miri64 commented Oct 26, 2017

Try to rebase again

@roberthartung
Copy link
Copy Markdown
Member Author

roberthartung commented Oct 26, 2017

Base branch is 2017.10-devel?

@miri64
Copy link
Copy Markdown
Member

miri64 commented Oct 26, 2017

No 2017.10-branch.

@roberthartung roberthartung force-pushed the 2017.10/pm_fix_pm_layered_conflict_set_lowest branch from 243f282 to 68fce37 Compare October 26, 2017 14:22
@roberthartung
Copy link
Copy Markdown
Member Author

roberthartung commented Oct 26, 2017

@miri64 looks better now?

@miri64
Copy link
Copy Markdown
Member

miri64 commented Oct 26, 2017

👍

@miri64 miri64 requested a review from haukepetersen October 26, 2017 14:24
@miri64 miri64 added Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) Area: pm Area: (Low) power management CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Oct 26, 2017
@miri64 miri64 added this to the Release 2017.10 milestone Oct 26, 2017
@miri64 miri64 mentioned this pull request Oct 26, 2017
Merged
@haukepetersen
Copy link
Copy Markdown
Contributor

haukepetersen commented Oct 27, 2017

Dam'n, other backports got in the way again. @roberthartung sorry to ask, but would you be so kind to rebase (again)?! Thanks!

haukepetersen
haukepetersen previously approved these changes Oct 27, 2017
View reviewed changes
Copy link
Copy Markdown
Contributor

@haukepetersen haukepetersen left a comment

Choose a reason for hiding this comment

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

ACK

@miri64
Copy link
Copy Markdown
Member

miri64 commented Oct 27, 2017

(you have to re-ACK as well as soon as @roberthartung rebases ;-))

@haukepetersen
Copy link
Copy Markdown
Contributor

haukepetersen commented Oct 27, 2017

will do

@haukepetersen haukepetersen mentioned this pull request Oct 27, 2017
Closed
43 tasks
@roberthartung roberthartung force-pushed the 2017.10/pm_fix_pm_layered_conflict_set_lowest branch from 68fce37 to 1cb627d Compare October 27, 2017 08:46
@roberthartung
Copy link
Copy Markdown
Member Author

roberthartung commented Oct 27, 2017

@haukepetersen @miri64 rebased.

haukepetersen
haukepetersen approved these changes Oct 27, 2017
View reviewed changes
Copy link
Copy Markdown
Contributor

@haukepetersen haukepetersen left a comment

Choose a reason for hiding this comment

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

re-ACK

@haukepetersen
Copy link
Copy Markdown
Contributor

haukepetersen commented Oct 27, 2017

all green -> go!

@haukepetersen haukepetersen merged commit 0514dae into RIOT-OS:2017.10-branch Oct 27, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@haukepetersen haukepetersen haukepetersen approved these changes

Assignees

@haukepetersen haukepetersen

@kaspar030 kaspar030

Labels

Area: pm Area: (Low) power management CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)

Projects

None yet

Milestone

Release 2017.10

Development

Successfully merging this pull request may close these issues.

4 participants

@roberthartung @miri64 @haukepetersen @kaspar030