OSDN Git Service

Merge branches 'pm-core', 'pm-sleep', 'pm-qos', 'pm-domains' and 'pm-em'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 4 Mar 2019 10:18:28 +0000 (11:18 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 4 Mar 2019 10:18:28 +0000 (11:18 +0100)
commitc3739c50ef4c4d1b7df347727a222d8b909311a5
tree7d586a85fcafbc08e5d0b6628d179a21ae089ba6
parent5b317cbf2bcb85a1e96ce87717cb991ecab1dd4d
parent656f72bb2ef33cd832a0f8e80893cce09f3d43df
parentd1c6b41b0f65d4c3933505f598b9f69873744404
parent659dc4562c1b15e3401ad15338d2109af7c6d718
parenteeb35df05244c268cd69b425edf6dc6a49ee7ab4
parent9cac42d0645ceb2ca8b815cee04810ec9b0d13b3
Merge branches 'pm-core', 'pm-sleep', 'pm-qos', 'pm-domains' and 'pm-em'

* pm-core:
  PM / core: Add support to skip power management in device/driver model
  PM / suspend: Print debug messages for device using direct-complete
  PM-runtime: update time accounting only when enabled
  PM-runtime: Switch accounting over to ktime_get_mono_fast_ns()
  PM-runtime: Optimize pm_runtime_autosuspend_expiration()
  PM-runtime: Replace jiffies-based accounting with ktime-based accounting
  PM-runtime: update accounting_timestamp on enable
  PM: clock_ops: fix missing clk_prepare() return value check
  drm/i915: Move on the new pm runtime interface
  PM-runtime: Add new interface to get accounted time

* pm-sleep:
  PM / wakeup: fix kerneldoc comment for pm_wakeup_dev_event()

* pm-qos:
  PM: QoS: no need to check return value of debugfs_create functions

* pm-domains:
  PM / Domains: Mark "name" const in dev_pm_domain_attach_by_name()
  PM / Domains: Mark "name" const in genpd_dev_pm_attach_by_name()
  PM: domains: no need to check return value of debugfs_create functions

* pm-em:
  PM / EM: Expose the Energy Model in debugfs