diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-04-11 13:22:46 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-04-11 13:22:46 +0200 |
| commit | 51798deaffb738ef3bdd4f544b11ce2adaff40f3 (patch) | |
| tree | 378f47d95daa60a069b02aec5966ffa00997bec3 /kernel | |
| parent | 2dd0df8472ff9bb520673cb5862b08be9290c9fa (diff) | |
| parent | bbe9a70a478129f3f9b2003415d0c36afcea210f (diff) | |
| parent | fe43e2ce526979271f6c682727c6af9e7c19bec5 (diff) | |
| download | linux-51798deaffb738ef3bdd4f544b11ce2adaff40f3.tar.bz2 | |
Merge branches 'pm-cpuidle' and 'pm-qos'
* pm-cpuidle:
tick-sched: avoid a maybe-uninitialized warning
cpuidle: Add definition of residency to sysfs documentation
time: hrtimer: Use timerqueue_iterate_next() to get to the next timer
nohz: Avoid duplication of code related to got_idle_tick
nohz: Gather tick_sched booleans under a common flag field
cpuidle: menu: Avoid selecting shallow states with stopped tick
cpuidle: menu: Refine idle state selection for running tick
sched: idle: Select idle state before stopping the tick
time: hrtimer: Introduce hrtimer_next_event_without()
time: tick-sched: Split tick_nohz_stop_sched_tick()
cpuidle: Return nohz hint from cpuidle_select()
jiffies: Introduce USER_TICK_USEC and redefine TICK_USEC
sched: idle: Do not stop the tick before cpuidle_idle_call()
sched: idle: Do not stop the tick upfront in the idle loop
time: tick-sched: Reorganize idle tick management code
* pm-qos:
PM / QoS: mark expected switch fall-throughs