From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 12 Dec 2016 19:46:35 +0000 (+0100)
Subject: Merge branches 'pm-sleep' and 'powercap'
X-Git-Tag: v4.14-rc1~1923^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=631ddaba5905c4348c88a62af4367b8e12737533;p=platform%2Fkernel%2Flinux-rpi.git

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
---

631ddaba5905c4348c88a62af4367b8e12737533