Skip to contentSkip to conversation

Hibernate fix and PM documentation updates for 3.2

GIT PULL Rafael J. Wysocki 1 participant 1 message Nov 29, 2011

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please pull a hibernate fix and power management documentation updates (on top of commit f10cdea68b70bd85706baed0decab59618f9c353) for 3.2 from:

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

with top-most commit f7bc83d87d242917ca0ee041ed509f57f361dd56 (PM: Update comments describing device power management callbacks).

The hibernate fix closes a massive memory leak from error and test code paths (which happens if hibernation is aborted early enough) and the documentation updates modify the documentation to follow the code again after some recent changes.

Thanks!

 Documentation/power/devices.txt    |  111 +++++++++++-------
 Documentation/power/runtime_pm.txt |   40 ++++---
 include/linux/pm.h                 |  229 +++++++++++++++++++++---------------
 kernel/power/hibernate.c           |   16 ++-
 4 files changed, 237 insertions(+), 159 deletions(-)

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

Rafael J. Wysocki (6):
PM / Hibernate: Do not leak memory in error/test code paths PM / Domains: Document how PM domains are used by the PM core PM / Sleep: Correct inaccurate information in devices.txt PM / Runtime: Make documentation follow the new behavior of irq_safe PM / Sleep: Update documentation related to system wakeup
PM: Update comments describing device power management callbacks