• Linus Torvalds's avatar
    Merge tag 'pm+acpi-4.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · c8b3fd0c
    Linus Torvalds authored
    Pull more power management and ACPI updates from Rafael Wysocki:
     "These are fixes mostly (intel_pstate, ACPI core, ACPI EC driver,
      cpupower tool), a new CPU ID for the Intel RAPL driver and one
      intel_pstate driver improvement that didn't make it to my previous
      pull requests due to timing.
       - Fix a build warning in the intel_pstate driver showing up in
         non-SMP builds (Borislav Petkov)
       - Change one of the intel_pstate's P-state selection parameters for
         Baytrail and Cherrytrail CPUs to significantly improve performance
         at the cost of a small increase in energy consumption (Kristen
         Carlson Accardi)
       - Fix a NULL pointer dereference in the ACPI EC driver due to an
         unsafe list walk in the query handler removal routine (Chris
       - Get rid of a false-positive lockdep warning in the ACPI container
         hot-remove code (Rafael J Wysocki)
       - Prevent the ACPI device enumeration code from creating device
         objects of a wrong type in some cases (Rafael J Wysocki)
       - Add Skylake processors support to the Intel RAPL power capping
         driver (Brian Bian)
       - Drop the stale MAINTAINERS entry for the ACPI dock driver that is
         regarded as part of the ACPI core and maintained along with it now
         (Chao Yu)
       - Fix cpupower tool breakage caused by a library API change in libpci
         3.3.0 (Lucas Stach)"
    * tag 'pm+acpi-4.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
      ACPI / scan: Add a scan handler for PRP0001
      ACPI / scan: Annotate physical_node_lock in acpi_scan_is_offline()
      ACPI / EC: fix NULL pointer dereference in acpi_ec_remove_query_handler()
      MAINTAINERS: remove maintainship entry of docking station driver
      powercap / RAPL: Add support for Intel Skylake processors
      cpufreq: intel_pstate: Fix an annoying !CONFIG_SMP warning
      intel_pstate: Change the setpoint for Atom params
      cpupower: fix breakage from libpci API change