From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751843Ab2DAGcO (ORCPT ); Sun, 1 Apr 2012 02:32:14 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:47519 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750843Ab2DAGcL (ORCPT ); Sun, 1 Apr 2012 02:32:11 -0400 From: "Rafael J. Wysocki" To: Linus Torvalds Subject: [GIT PULL] More power management updates for 3.4 Date: Sun, 1 Apr 2012 08:36:30 +0200 User-Agent: KMail/1.13.6 (Linux/3.3.0+; KDE/4.6.0; x86_64; ; ) Cc: Linux PM mailing list , LKML , Stephen Boyd , MyungJoo Ham , Greg KH , Alan Stern MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201204010836.30707.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, I prepared this on Friday with the hope to send the pull request before the end of the merge window, but then I had to go to San Francisco (for the LFCS) and missed the opportunity. That said, this includes fixes mostly (and -stable ones for that matter), so I think it's appropriate for the -rc1 time frame too. Please pull additional power management updates for 3.4 since commit 735e941caa9a35f933297af0ab1e0ad6447411c4: Merge tag 'common-clk-api' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc with top-most commit c4772d192c70b61d52262b0db76f7abd8aeb51c6: PM / QoS: add pm_qos_update_request_timeout() API from the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm-for-3.4-part-2 This mostly consists of fixes and changes requisite for those fixes, with the exception of the last commit, which is a new feature. However, that new feature is reasonably isolated and very unlikely to cause any regressions to happen, although it is necessary for some future changes in the works now. Included are: * Patch series that hopefully fixes races between the freezer and request_firmware() and request_firmware_nowait() for good, with two cleanups from Stephen Boyd on top. * Runtime PM fix from Alan Stern preventing tasks from getting stuck indefinitely in the runtime PM wait queue. * Device PM QoS update from MyungJoo Ham introducing a new variant of pm_qos_update_request() allowing the callers to specify a timeout. Thanks! drivers/base/firmware_class.c | 208 +++++++++++++++++++++-------------------- drivers/base/power/runtime.c | 3 +- include/linux/kmod.h | 27 +++++- include/linux/pm_qos.h | 4 + kernel/kmod.c | 117 +++++++++++++++++------ kernel/power/hibernate.c | 18 +--- kernel/power/process.c | 8 ++ kernel/power/qos.c | 50 ++++++++++ kernel/power/suspend.c | 7 -- kernel/power/user.c | 10 +-- 10 files changed, 284 insertions(+), 168 deletions(-) --------------- Alan Stern (1): PM / Runtime: don't forget to wake up waitqueue on failure MyungJoo Ham (1): PM / QoS: add pm_qos_update_request_timeout() API Rafael J. Wysocki (6): firmware_class: Rework usermodehelper check firmware_class: Split _request_firmware() into three functions, v2 firmware_class: Do not warn that system is not ready from async loads PM / Hibernate: Disable usermode helpers right before freezing tasks PM / Sleep: Move disabling of usermode helpers to the freezer PM / Sleep: Mitigate race between the freezer and request_firmware() Stephen Boyd (2): firmware_class: Reorganize fw_create_instance() firmware_class: Move request_firmware_nowait() to workqueues