summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-12-12 22:46:35 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-12-12 22:46:35 +0300
commit631ddaba5905c4348c88a62af4367b8e12737533 (patch)
tree78fedcab46b23668391bd5d6b02bc8f121927ee0 /arch
parentb19ad3b9f1fd46bb7d4ac623a4f2cb46fa2cb7a0 (diff)
parent9320f95c0b8f1d074f570385e6855d4554f693e4 (diff)
parentbd9089162d8002666f734dd18552c7297118fec3 (diff)
downloadlinux-631ddaba5905c4348c88a62af4367b8e12737533.tar.xz
Merge branches 'pm-sleep' and 'powercap'
* pm-sleep: PM / sleep: Print active wakeup sources when blocking on wakeup_count reads x86/suspend: fix false positive KASAN warning on suspend/resume PM / sleep / ACPI: Use the ACPI_FADT_LOW_POWER_S0 flag PM / sleep: System sleep state selection interface rework PM / hibernate: Verify the consistent of e820 memory map by md5 digest * powercap: powercap / RAPL: Add Knights Mill CPUID powercap/intel_rapl: fix and tidy up error handling powercap/intel_rapl: Track active CPUs internally powercap/intel_rapl: Cleanup duplicated init code powercap/intel rapl: Convert to hotplug state machine powercap/intel_rapl: Propagate error code when registration fails powercap/intel_rapl: Add missing domain data update on hotplug