Skip to content
  • Linus Torvalds's avatar
    Merge tag 'pm+acpi-3.15-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 70f6c087
    Linus Torvalds authored
    Pull more ACPI and power management updates from Rafael Wysocki:
     "These are commits that were not quite ready when I sent the original
      pull request for 3.15-rc1 several days ago, but they have spent some
      time in linux-next since then and appear to be good to go.  All of
      them are fixes and cleanups.
    
      Specifics:
    
       - Remaining changes from upstream ACPICA release 20140214 that
         introduce code to automatically serialize the execution of methods
         creating any named objects which really cannot be executed in
         parallel with each other anyway (previously ACPICA attempted to
         address that by aborting methods upon conflict detection, but that
         wasn't reliable enough and led to other issues).  From Bob Moore
         and Lv Zheng.
    
       - intel_pstate fix to use del_timer_sync() instead of del_timer() in
         the exit path before freeing the timer structure from Dirk
         Brandewie (original patch from Thomas Gleixner).
    
       - cpufreq fix related to system resume from Viresh Kumar.
    
       - Serialization of frequency transitions in cpufreq that involve
         PRECHANGE and POSTCHANGE notifications to avoid ordering issues
         resulting from race conditions.  From Srivatsa S Bhat and Viresh
         Kumar.
    
       - Revert of an ACPI processor driver change that was based on a
         specific interpretation of the ACPI spec which may not be correct
         (the relevant part of the spec appears to be incomplete).  From
         Hanjun Guo.
    
       - Runtime PM core cleanups and documentation updates from Geert
         Uytterhoeven.
    
       - PNP core cleanup from Michael Opdenacker"
    
    * tag 'pm+acpi-3.15-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
      cpufreq: Make cpufreq_notify_transition & cpufreq_notify_post_transition static
      cpufreq: Convert existing drivers to use cpufreq_freq_transition_{begin|end}
      cpufreq: Make sure frequency transitions are serialized
      intel_pstate: Use del_timer_sync in intel_pstate_cpu_stop
      cpufreq: resume drivers before enabling governors
      PM / Runtime: Spelling s/competing/completing/
      PM / Runtime: s/foo_process_requests/foo_process_next_request/
      PM / Runtime: GENERIC_SUBSYS_PM_OPS is gone
      PM / Runtime: Correct documented return values for generic PM callbacks
      PM / Runtime: Split line longer than 80 characters
      PM / Runtime: dev_pm_info.runtime_error is signed
      Revert "ACPI / processor: Make it possible to get APIC ID via GIC"
      ACPICA: Enable auto-serialization as a default kernel behavior.
      ACPICA: Ignore sync_level for methods that have been auto-serialized.
      ACPICA: Add additional named objects for the auto-serialize method scan.
      ACPICA: Add auto-serialization support for ill-behaved control methods.
      ACPICA: Remove global option to serialize all control methods.
      PNP: remove deprecated IRQF_DISABLED
    70f6c087