Skip to contentSkip to conversation

PM fixes for 2.6.32

GIT PULL Rafael J. Wysocki 1 participant 1 message Nov 3, 2009

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please pull power management fixes for 2.6.32 from:

git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git pm-fixes

This includes the following changes:

* The fix for http://bugzilla.kernel.org/show_bug.cgi?id=14334 (yenta resume regression from 2.6.31).

* Hibernation fixes from Jiri Slaby. Two of these patches fix long standing bugs, but in my opinion they are simple enough to go into 2.6.32. The third one is a two-liner complementing one of the fixes.

* PM core error code path fix from Romit Dasgupta.

* Removal of some run-time PM debug messages creating too much noise from Pavel (the run-time PM framework is a new feature in 2.6.32 and this is just a refinement of it).

 drivers/base/power/main.c     |    1 +
 drivers/base/power/runtime.c  |    4 --
 drivers/pcmcia/cs.c           |   69 +++++++++++++++++++++++++---------------
 drivers/pcmcia/yenta_socket.c |   12 ++++++-
 include/pcmcia/ss.h           |    4 ++
 kernel/power/hibernate.c      |   11 +++++--
 kernel/power/swap.c           |   43 +++++++++++++------------
 7 files changed, 89 insertions(+), 55 deletions(-)

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

Jiri Slaby (3):
PM / Hibernate: Fix blkdev refleaks
PM / Hibernate: Fix error handling in save_image() PM / Hibernate: Add newline to load_image() fail path

Pavel Machek (1):
PM: Remove some debug messages producing too much noise

Rafael J. Wysocki (1):
PM / yenta: Split resume into early and late parts (rev. 4)

Romit Dasgupta (1):
PM: Fix warning on suspend errors