* PM: Summary of changes for v3.6
@ 2012-07-16 20:46 Rafael J. Wysocki
2012-07-16 22:11 ` Kevin Hilman
0 siblings, 1 reply; 6+ messages in thread
From: Rafael J. Wysocki @ 2012-07-16 20:46 UTC (permalink / raw)
To: LKML; +Cc: Linux PM list, Len Brown, ACPI Devel Mailing List, Alan Stern
Hi all,
All of the changes I'd like to include into the first PM pull request during
the v3.6 merge window, except maybe for one or two patches I know are in the
works, is on the 'linux-next' branch of the linux-pm.git tree now. The summary
of those changes is appended. If anyone finds any of them objectionable,
please let me know ASAP. Also please let me know if you have any power
management patches you'd like me to take for v3.6.
Thanks,
Rafael
---
Documentation/ABI/testing/sysfs-power | 13 ++
Documentation/power/devices.txt | 9 +-
Documentation/power/swsusp.txt | 5 +
arch/x86/platform/olpc/olpc-xo15-sci.c | 6 +-
drivers/acpi/ac.c | 17 +-
drivers/acpi/battery.c | 15 +-
drivers/acpi/button.c | 9 +-
drivers/acpi/fan.c | 21 +-
drivers/acpi/power.c | 12 +-
drivers/acpi/processor_driver.c | 13 +-
drivers/acpi/processor_idle.c | 43 +---
drivers/acpi/sbs.c | 10 +-
drivers/acpi/scan.c | 22 --
drivers/acpi/thermal.c | 17 +-
drivers/base/dd.c | 6 +-
drivers/base/power/domain.c | 342 ++++++++++++++++++++++++-------
drivers/base/power/main.c | 8 +-
drivers/base/power/sysfs.c | 4 +
drivers/block/mg_disk.c | 13 +-
drivers/char/hw_random/omap-rng.c | 13 +-
drivers/char/ipmi/ipmi_si_intf.c | 16 --
drivers/char/sonypi.c | 13 +-
drivers/char/tpm/tpm.c | 2 +-
drivers/char/tpm/tpm.h | 2 +-
drivers/char/tpm/tpm_atmel.c | 12 +-
drivers/char/tpm/tpm_nsc.c | 13 +-
drivers/char/tpm/tpm_tis.c | 18 +-
drivers/cpuidle/cpuidle.c | 18 +-
drivers/cpuidle/driver.c | 29 ++-
drivers/cpuidle/governors/menu.c | 6 +-
drivers/cpuidle/sysfs.c | 21 +-
drivers/crypto/ux500/cryp/cryp_core.c | 39 ++--
drivers/crypto/ux500/hash/hash_core.c | 33 ++-
drivers/hwmon/acpi_power_meter.c | 13 +-
drivers/idle/intel_idle.c | 41 ++--
drivers/platform/x86/acer-wmi.c | 10 +-
drivers/platform/x86/classmate-laptop.c | 13 +-
drivers/platform/x86/fujitsu-tablet.c | 8 +-
drivers/platform/x86/hdaps.c | 6 +-
drivers/platform/x86/hp_accel.c | 15 +-
drivers/platform/x86/intel_ips.c | 17 --
drivers/platform/x86/intel_mid_thermal.c | 16 +-
drivers/platform/x86/msi-laptop.c | 7 +-
drivers/platform/x86/panasonic-laptop.c | 16 +-
drivers/platform/x86/sony-laptop.c | 20 +-
drivers/platform/x86/thinkpad_acpi.c | 23 ++-
drivers/platform/x86/toshiba_acpi.c | 15 +-
drivers/platform/x86/toshiba_bluetooth.c | 10 +-
drivers/platform/x86/xo15-ebook.c | 8 +-
drivers/rtc/rtc-cmos.c | 1 +
include/acpi/acpi_bus.h | 5 -
include/acpi/processor.h | 7 +-
include/linux/cpuidle.h | 20 +-
include/linux/pm_domain.h | 18 ++
include/linux/suspend.h | 6 +
kernel/power/Kconfig | 4 +-
kernel/power/hibernate.c | 42 ++++
kernel/power/main.c | 45 ++++
kernel/power/power.h | 3 +
kernel/power/suspend.c | 3 +
kernel/power/swap.c | 82 +++++---
61 files changed, 828 insertions(+), 466 deletions(-)
---------------
Bojan Smojver (2):
PM / Hibernate: Enable suspend to both for in-kernel hibernation.
PM / Hibernate: Print hibernation/thaw progress indicator one line at a time.
Daniel Lezcano (4):
ACPI: intel_idle : break dependency between modules
cpuidle / ACPI : remove latency_ticks from acpi_processor_cx structure
cpuidle / ACPI: remove usage from acpi_processor_cx structure
cpuilde / ACPI: remove time from acpi_processor_cx structure
Oskar Schirmer (1):
PM / Documentation: fix typos in power management description
Paul Fox (1):
rtc-cmos: report wakeups from interrupt handler
Preeti U Murthy (1):
PM / cpuidle: System resume hang fix with cpuidle
Rafael J. Wysocki (50):
ACPI / PM: Drop pm_message_t argument from device suspend callback
ACPI / PM: Make acpi_bus_type use struct dev_pm_ops for PM handling
ACPI / PM: Make acpi_bus_type use driver struct dev_pm_ops callbacks
ACPI: Use struct dev_pm_ops for power management in the fan driver
ACPI: Use struct dev_pm_ops for power management in the thermal driver
ACPI: Use struct dev_pm_ops for power management in processor driver
ACPI: Use struct dev_pm_ops for power management in the AC driver
ACPI: Use struct dev_pm_ops for power management in the battery driver
ACPI: Use struct dev_pm_ops for power management in the button driver
ACPI: Use struct dev_pm_ops for power management in the power driver
ACPI: Use struct dev_pm_ops for power management in the SBS driver
toshiba_acpi: Use struct dev_pm_ops for power management
hp_accel: Use struct dev_pm_ops for power management
sony-laptop: Use struct dev_pm_ops for power management
panasonic-laptop: Use struct dev_pm_ops for power management
toshiba_bluetooth: Use struct dev_pm_ops for power management
xo15-ebook: Use struct dev_pm_ops for power management
classmate-laptop: Use struct dev_pm_ops for power management
fujitsu-tablet: Use struct dev_pm_ops for power management
acpi_power_meter: Use struct dev_pm_ops for power management
ACPI / PM: Do not execute legacy driver PM callbacks
ACPI / PM: Drop legacy driver PM callbacks that are not used any more
ACPI / PM: Drop PM callbacks from the ACPI bus type
thinkpad_acpi: Drop pm_message_t arguments from suspend routines
thinkpad_acpi: Use struct dev_pm_ops instead of legacy PM routines
intel_ips: Remove empty legacy PM callbacks
acer-wmi: Use struct dev_pm_ops for power management
intel_mid_thermal: Use struct dev_pm_ops for power management
sonypi: Use struct dev_pm_ops for power management
PM / Sleep: Separate printing suspend times from initcall_debug
PM / Domains: Use subsystem runtime suspend/resume callbacks by default
PM / Domains: Do not stop devices after restoring their states
hdaps: Use struct dev_pm_ops for power management
PM / cpuidle: Add driver reference counter
PM / Domains: Add preliminary support for cpuidle, v2
PM / Domains: Add device domain data reference counter
PM / Domains: Allow device callbacks to be added at any time
msi-laptop: Use struct dev_pm_ops for power management
mg_disk: Use struct dev_pm_ops for power management
omap-rng: Use struct dev_pm_ops for power management
PM / TPM: Drop unused pm_message_t argument from tpm_pm_suspend()
tpm_atmel: Use struct dev_pm_ops for power management
tpm_tis: Use struct dev_pm_ops for power management
tpm_nsc: Use struct dev_pm_ops for power management
PM / IPMI: Remove empty legacy PCI PM callbacks
PM / crypto / ux500: Use struct dev_pm_ops for power management
olpc-xo15-sci: Use struct dev_pm_ops for power management
PM / Domains: Fix build warning for CONFIG_PM_RUNTIME unset
PM / Sleep: Fix build warning in sysfs.c for CONFIG_PM_SLEEP unset
PM / Runtime: Do not increment device usage counts before probing
Sachin Kamat (2):
PM / Domains: Add missing static storage class specifier in domain.c file
PM / Domains: Replace plain integer with NULL pointer in domain.c file
Sameer Nanda (1):
PM / Sleep: add knob for printing device resume times
ShuoX Liu (1):
cpuidle: move field disable from per-driver to per-cpu
Srivatsa S. Bhat (1):
ftrace: Disable function tracing during suspend/resume and hibernation, again
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: PM: Summary of changes for v3.6
2012-07-16 20:46 PM: Summary of changes for v3.6 Rafael J. Wysocki
@ 2012-07-16 22:11 ` Kevin Hilman
2012-07-17 20:52 ` Rafael J. Wysocki
0 siblings, 1 reply; 6+ messages in thread
From: Kevin Hilman @ 2012-07-16 22:11 UTC (permalink / raw)
To: Rafael J. Wysocki, Daniel Lezcano
Cc: LKML, Linux PM list, Len Brown, ACPI Devel Mailing List,
Alan Stern
Rafael, Daniel,
"Rafael J. Wysocki" <rjw@sisk.pl> writes:
> Hi all,
>
> All of the changes I'd like to include into the first PM pull request during
> the v3.6 merge window, except maybe for one or two patches I know are in the
> works, is on the 'linux-next' branch of the linux-pm.git tree now. The summary
> of those changes is appended. If anyone finds any of them objectionable,
> please let me know ASAP. Also please let me know if you have any power
> management patches you'd like me to take for v3.6.
>
Could someone please clarify the status of the coupled CPUidle series?
There's a version of these in Daniels cpuidle-next branch and there's a
version of these in Len's next branch (included in linux-next), but I'm
still not entirely sure which branch is going upstream and which branch
has the latest version (but I think Daniel's is the latest)
Thanks for clarifying,
Kevin
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: PM: Summary of changes for v3.6
2012-07-16 22:11 ` Kevin Hilman
@ 2012-07-17 20:52 ` Rafael J. Wysocki
2012-07-17 20:53 ` Colin Cross
0 siblings, 1 reply; 6+ messages in thread
From: Rafael J. Wysocki @ 2012-07-17 20:52 UTC (permalink / raw)
To: Kevin Hilman
Cc: Daniel Lezcano, LKML, Linux PM list, Len Brown,
ACPI Devel Mailing List, Alan Stern, Colin Cross
Hi,
On Tuesday, July 17, 2012, Kevin Hilman wrote:
> Rafael, Daniel,
>
> "Rafael J. Wysocki" <rjw@sisk.pl> writes:
>
> > Hi all,
> >
> > All of the changes I'd like to include into the first PM pull request during
> > the v3.6 merge window, except maybe for one or two patches I know are in the
> > works, is on the 'linux-next' branch of the linux-pm.git tree now. The summary
> > of those changes is appended. If anyone finds any of them objectionable,
> > please let me know ASAP. Also please let me know if you have any power
> > management patches you'd like me to take for v3.6.
> >
>
> Could someone please clarify the status of the coupled CPUidle series?
>
> There's a version of these in Daniels cpuidle-next branch and there's a
> version of these in Len's next branch (included in linux-next), but I'm
> still not entirely sure which branch is going upstream and which branch
> has the latest version (but I think Daniel's is the latest)
Colin says that the commits in the Len's tree match his latest version,
so I think those commits should be merged, since they have been present
in that tree since the 3.5 merge window.
Thanks,
Rafael
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: PM: Summary of changes for v3.6
2012-07-17 20:52 ` Rafael J. Wysocki
@ 2012-07-17 20:53 ` Colin Cross
2012-07-19 4:48 ` Len Brown
0 siblings, 1 reply; 6+ messages in thread
From: Colin Cross @ 2012-07-17 20:53 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Kevin Hilman, Daniel Lezcano, LKML, Linux PM list, Len Brown,
ACPI Devel Mailing List, Alan Stern
On Tue, Jul 17, 2012 at 1:52 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> Hi,
>
> On Tuesday, July 17, 2012, Kevin Hilman wrote:
>> Rafael, Daniel,
>>
>> "Rafael J. Wysocki" <rjw@sisk.pl> writes:
>>
>> > Hi all,
>> >
>> > All of the changes I'd like to include into the first PM pull request during
>> > the v3.6 merge window, except maybe for one or two patches I know are in the
>> > works, is on the 'linux-next' branch of the linux-pm.git tree now. The summary
>> > of those changes is appended. If anyone finds any of them objectionable,
>> > please let me know ASAP. Also please let me know if you have any power
>> > management patches you'd like me to take for v3.6.
>> >
>>
>> Could someone please clarify the status of the coupled CPUidle series?
>>
>> There's a version of these in Daniels cpuidle-next branch and there's a
>> version of these in Len's next branch (included in linux-next), but I'm
>> still not entirely sure which branch is going upstream and which branch
>> has the latest version (but I think Daniel's is the latest)
>
> Colin says that the commits in the Len's tree match his latest version,
> so I think those commits should be merged, since they have been present
> in that tree since the 3.5 merge window.
The disappeared from Len's tree for a little while after the 3.5 merge
window, which is why they started appearing other places. Now that
they have returned to Len's tree, hopefully to stay, they should be
considered the official version.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: PM: Summary of changes for v3.6
2012-07-17 20:53 ` Colin Cross
@ 2012-07-19 4:48 ` Len Brown
2012-07-26 0:18 ` Kevin Hilman
0 siblings, 1 reply; 6+ messages in thread
From: Len Brown @ 2012-07-19 4:48 UTC (permalink / raw)
To: Colin Cross
Cc: Rafael J. Wysocki, Kevin Hilman, Daniel Lezcano, LKML,
Linux PM list, ACPI Devel Mailing List, Alan Stern
> The disappeared from Len's tree for a little while after the 3.5 merge
> window, which is why they started appearing other places. Now that
> they have returned to Len's tree, hopefully to stay, they should be
> considered the official version.
Yes, they are staged for 3.6 in my tree.
The intent was to push them for 3.5, but some unrelated patches
exploded and stopped that push. I then had to re-merge my tree
to push only the bug-fixes to 3.5, which is why the feature
patches went away for a bit.
thanks,
-Len
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: PM: Summary of changes for v3.6
2012-07-19 4:48 ` Len Brown
@ 2012-07-26 0:18 ` Kevin Hilman
0 siblings, 0 replies; 6+ messages in thread
From: Kevin Hilman @ 2012-07-26 0:18 UTC (permalink / raw)
To: Len Brown
Cc: Colin Cross, Rafael J. Wysocki, Daniel Lezcano, LKML,
Linux PM list, ACPI Devel Mailing List, Alan Stern
Len Brown <lenb@kernel.org> writes:
>> The disappeared from Len's tree for a little while after the 3.5 merge
>> window, which is why they started appearing other places. Now that
>> they have returned to Len's tree, hopefully to stay, they should be
>> considered the official version.
>
> Yes, they are staged for 3.6 in my tree.
>
> The intent was to push them for 3.5, but some unrelated patches
> exploded and stopped that push. I then had to re-merge my tree
> to push only the bug-fixes to 3.5, which is why the feature
> patches went away for a bit.
Great, thanks for clarifying.
Kevin
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-07-26 0:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-16 20:46 PM: Summary of changes for v3.6 Rafael J. Wysocki
2012-07-16 22:11 ` Kevin Hilman
2012-07-17 20:52 ` Rafael J. Wysocki
2012-07-17 20:53 ` Colin Cross
2012-07-19 4:48 ` Len Brown
2012-07-26 0:18 ` Kevin Hilman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).