[GIT PULL] Power management fixes for v3.13-rc3

[GIT PULL] Power management fixes for v3.13-rc3

[Rafael J. Wysocki]

Hi Linus,

Please pull from the git repository at

  git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm-3.13-rc3

to receive power management fixes for v3.13-rc3 with
top-most commit 8e7030097e9f3ea8031e8cc4230e357cb556f8f9

  Merge branches 'pm-epoll', 'pnp' and 'powercap'

on top of commit dc1ccc48159d63eca5089e507c82c7d22ef60839

  Linux 3.13-rc2

These fix two regressions introduced in 3.12 (in cpufreq and PNP core),
fix up the new power capping framework and recent changes in intel_idle
and cpufreq, and fix a couple of older bugs.

Specifics:

 - cpufreq regression fix from Bjørn Mork restoring the pre-3.12
   behavior of the framework during system suspend/hibernation to
   avoid garbage sysfs files from being left behind in case of a
   suspend error.

 - PNP regression fix to restore the correct states of devices after
   resume from hibernation broken in 3.12.  From Dmitry Torokhov.

 - cpuidle fix to prevent cpuidle device unregistration from crashing 
   due to a NULL pointer dereference if cpuidle has been disabled
   from the kernel command line.  From Konrad Rzeszutek Wilk.

 - intel_idle fix for the C6 state definition on Intel Avoton/Rangeley
   processors from Arne Bockholdt.

 - Power capping framework fix to make the energy_uj sysfs attribute
   work in accordance with the documentation.  From Srinivas Pandruvada.

 - epoll fix to make it ignore the EPOLLWAKEUP flag if the kernel has
   been compiled with CONFIG_PM_SLEEP unset (in which case that flag
   should not have any effect).  From Amit Pundir.

 - cpufreq fix to prevent governor sysfs files from being lost over
   system suspend/resume in some (arguably unusual) situations.  From
   Viresh Kumar.

Thanks!


---------------

Amit Pundir (1):
      epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled

Bjørn Mork (1):
      cpufreq: fix garbage kobjects on errors during suspend/resume

Bockholdt Arne (1):
      intel_idle: Fixed C6 state on Avoton/Rangeley processors

Dmitry Torokhov (1):
      PNP: fix restoring devices after hibernation

Konrad Rzeszutek Wilk (1):
      cpuidle: Check for dev before deregistering it.

Srinivas Pandruvada (1):
      PowerCap: Fix mode for energy counter

Viresh Kumar (1):
      cpufreq: suspend governors on system suspend/hibernate

---------------

 drivers/base/power/main.c       |    3 +++
 drivers/cpufreq/cpufreq.c       |   46 ++++++++++++++++++++++++++++++++++++---
 drivers/cpuidle/cpuidle.c       |    2 +-
 drivers/idle/intel_idle.c       |    4 ++--
 drivers/pnp/driver.c            |   12 +++++++++-
 drivers/powercap/powercap_sys.c |    7 +++++-
 fs/eventpoll.c                  |    3 +--
 include/linux/cpufreq.h         |    8 +++++++
 include/uapi/linux/eventpoll.h  |   13 ++++++++++-
 9 files changed, 87 insertions(+), 11 deletions(-)

[GIT PULL] Post-v3.13-rc3 power management fixup

[Rafael J. Wysocki]

Hi Linus,

Please pull from the git repository at

  git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm-3.13-rc3-fixup

to receive reverts of two recent cpufreq fixes that broke more
than they fixed for v3.13-rc4 with top-most commit d4faadd5d5b3

  Revert "cpufreq: fix garbage kobjects on errors during suspend/resume"

on top of commit 374b105797c3d4f29c685f3be535c35f5689b30e

  Linux 3.13-rc3

This reverts commits that fixed issues for some people, but broke
things for others, so revert them and we'll need to fix the original
problems differently.

Thanks!


---------------

Rafael J. Wysocki (2):
      Revert "cpufreq: suspend governors on system suspend/hibernate"
      Revert "cpufreq: fix garbage kobjects on errors during suspend/resume"

---------------

 drivers/base/power/main.c |    3 ---
 drivers/cpufreq/cpufreq.c |   46 +++------------------------------------------
 include/linux/cpufreq.h   |    8 --------
 3 files changed, 3 insertions(+), 54 deletions(-)