From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Feb 2019 18:23:39 +0000 (-0800)
Subject: Merge tag 'pm-5.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=3325254ca14c4b859d75be757518dc2c0ebe298f;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'pm-5.0-rc5' of git://git./linux/kernel/git/rafael/linux-pm

Pull power management fixes from Rafael Wysocki:
 "These fix a PM-runtime framework regression introduced by the recent
  switch-over of device autosuspend to hrtimers and a mistake in the
  "poll idle state" code introduced by a recent change in it.

  Specifics:

   - Since ktime_get() turns out to be problematic for device
     autosuspend in the PM-runtime framework, make it use
     ktime_get_mono_fast_ns() instead (Vincent Guittot).

   - Fix an initial value of a local variable in the "poll idle state"
     code that makes it behave not exactly as expected when all idle
     states except for the "polling" one are disabled (Doug Smythies)"

* tag 'pm-5.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpuidle: poll_state: Fix default time limit
  PM-runtime: Fix deadlock with ktime_get()
---

3325254ca14c4b859d75be757518dc2c0ebe298f