Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97c53b40 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v3.12' into core/locking to pick up mutex upates



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 6a716c90 5e01dc7b
Loading
Loading
Loading
Loading
+1 −2
Original line number Original line Diff line number Diff line
@@ -2808,8 +2808,7 @@ S: Ottawa, Ontario
S: Canada K2P 0X8
S: Canada K2P 0X8


N: Mikael Pettersson
N: Mikael Pettersson
E: mikpe@it.uu.se
E: mikpelinux@gmail.com
W: http://user.it.uu.se/~mikpe/linux/
D: Miscellaneous fixes
D: Miscellaneous fixes


N: Reed H. Petty
N: Reed H. Petty
+4 −4
Original line number Original line Diff line number Diff line
@@ -37,8 +37,8 @@ Description:
		that the USB device has been connected to the machine.  This
		that the USB device has been connected to the machine.  This
		file is read-only.
		file is read-only.
Users:
Users:
		PowerTOP <power@bughost.org>
		PowerTOP <powertop@lists.01.org>
		http://www.lesswatts.org/projects/powertop/
		https://01.org/powertop/


What:		/sys/bus/usb/device/.../power/active_duration
What:		/sys/bus/usb/device/.../power/active_duration
Date:		January 2008
Date:		January 2008
@@ -57,8 +57,8 @@ Description:
		will give an integer percentage.  Note that this does not
		will give an integer percentage.  Note that this does not
		account for counter wrap.
		account for counter wrap.
Users:
Users:
		PowerTOP <power@bughost.org>
		PowerTOP <powertop@lists.01.org>
		http://www.lesswatts.org/projects/powertop/
		https://01.org/powertop/


What:		/sys/bus/usb/devices/<busnum>-<port[.port]>...:<config num>-<interface num>/supports_autosuspend
What:		/sys/bus/usb/devices/<busnum>-<port[.port]>...:<config num>-<interface num>/supports_autosuspend
Date:		January 2008
Date:		January 2008
+16 −16
Original line number Original line Diff line number Diff line
What:		/sys/devices/.../power/
What:		/sys/devices/.../power/
Date:		January 2009
Date:		January 2009
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/devices/.../power directory contains attributes
		The /sys/devices/.../power directory contains attributes
		allowing the user space to check and modify some power
		allowing the user space to check and modify some power
@@ -8,7 +8,7 @@ Description:


What:		/sys/devices/.../power/wakeup
What:		/sys/devices/.../power/wakeup
Date:		January 2009
Date:		January 2009
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/devices/.../power/wakeup attribute allows the user
		The /sys/devices/.../power/wakeup attribute allows the user
		space to check if the device is enabled to wake up the system
		space to check if the device is enabled to wake up the system
@@ -34,7 +34,7 @@ Description:


What:		/sys/devices/.../power/control
What:		/sys/devices/.../power/control
Date:		January 2009
Date:		January 2009
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/devices/.../power/control attribute allows the user
		The /sys/devices/.../power/control attribute allows the user
		space to control the run-time power management of the device.
		space to control the run-time power management of the device.
@@ -53,7 +53,7 @@ Description:


What:		/sys/devices/.../power/async
What:		/sys/devices/.../power/async
Date:		January 2009
Date:		January 2009
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/devices/.../async attribute allows the user space to
		The /sys/devices/.../async attribute allows the user space to
		enable or diasble the device's suspend and resume callbacks to
		enable or diasble the device's suspend and resume callbacks to
@@ -79,7 +79,7 @@ Description:


What:		/sys/devices/.../power/wakeup_count
What:		/sys/devices/.../power/wakeup_count
Date:		September 2010
Date:		September 2010
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/devices/.../wakeup_count attribute contains the number
		The /sys/devices/.../wakeup_count attribute contains the number
		of signaled wakeup events associated with the device.  This
		of signaled wakeup events associated with the device.  This
@@ -88,7 +88,7 @@ Description:


What:		/sys/devices/.../power/wakeup_active_count
What:		/sys/devices/.../power/wakeup_active_count
Date:		September 2010
Date:		September 2010
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/devices/.../wakeup_active_count attribute contains the
		The /sys/devices/.../wakeup_active_count attribute contains the
		number of times the processing of wakeup events associated with
		number of times the processing of wakeup events associated with
@@ -98,7 +98,7 @@ Description:


What:		/sys/devices/.../power/wakeup_abort_count
What:		/sys/devices/.../power/wakeup_abort_count
Date:		February 2012
Date:		February 2012
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/devices/.../wakeup_abort_count attribute contains the
		The /sys/devices/.../wakeup_abort_count attribute contains the
		number of times the processing of a wakeup event associated with
		number of times the processing of a wakeup event associated with
@@ -109,7 +109,7 @@ Description:


What:		/sys/devices/.../power/wakeup_expire_count
What:		/sys/devices/.../power/wakeup_expire_count
Date:		February 2012
Date:		February 2012
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/devices/.../wakeup_expire_count attribute contains the
		The /sys/devices/.../wakeup_expire_count attribute contains the
		number of times a wakeup event associated with the device has
		number of times a wakeup event associated with the device has
@@ -119,7 +119,7 @@ Description:


What:		/sys/devices/.../power/wakeup_active
What:		/sys/devices/.../power/wakeup_active
Date:		September 2010
Date:		September 2010
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/devices/.../wakeup_active attribute contains either 1,
		The /sys/devices/.../wakeup_active attribute contains either 1,
		or 0, depending on whether or not a wakeup event associated with
		or 0, depending on whether or not a wakeup event associated with
@@ -129,7 +129,7 @@ Description:


What:		/sys/devices/.../power/wakeup_total_time_ms
What:		/sys/devices/.../power/wakeup_total_time_ms
Date:		September 2010
Date:		September 2010
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/devices/.../wakeup_total_time_ms attribute contains
		The /sys/devices/.../wakeup_total_time_ms attribute contains
		the total time of processing wakeup events associated with the
		the total time of processing wakeup events associated with the
@@ -139,7 +139,7 @@ Description:


What:		/sys/devices/.../power/wakeup_max_time_ms
What:		/sys/devices/.../power/wakeup_max_time_ms
Date:		September 2010
Date:		September 2010
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/devices/.../wakeup_max_time_ms attribute contains
		The /sys/devices/.../wakeup_max_time_ms attribute contains
		the maximum time of processing a single wakeup event associated
		the maximum time of processing a single wakeup event associated
@@ -149,7 +149,7 @@ Description:


What:		/sys/devices/.../power/wakeup_last_time_ms
What:		/sys/devices/.../power/wakeup_last_time_ms
Date:		September 2010
Date:		September 2010
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/devices/.../wakeup_last_time_ms attribute contains
		The /sys/devices/.../wakeup_last_time_ms attribute contains
		the value of the monotonic clock corresponding to the time of
		the value of the monotonic clock corresponding to the time of
@@ -160,7 +160,7 @@ Description:


What:		/sys/devices/.../power/wakeup_prevent_sleep_time_ms
What:		/sys/devices/.../power/wakeup_prevent_sleep_time_ms
Date:		February 2012
Date:		February 2012
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute
		The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute
		contains the total time the device has been preventing
		contains the total time the device has been preventing
@@ -189,7 +189,7 @@ Description:


What:		/sys/devices/.../power/pm_qos_latency_us
What:		/sys/devices/.../power/pm_qos_latency_us
Date:		March 2012
Date:		March 2012
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/devices/.../power/pm_qos_resume_latency_us attribute
		The /sys/devices/.../power/pm_qos_resume_latency_us attribute
		contains the PM QoS resume latency limit for the given device,
		contains the PM QoS resume latency limit for the given device,
@@ -207,7 +207,7 @@ Description:


What:		/sys/devices/.../power/pm_qos_no_power_off
What:		/sys/devices/.../power/pm_qos_no_power_off
Date:		September 2012
Date:		September 2012
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/devices/.../power/pm_qos_no_power_off attribute
		The /sys/devices/.../power/pm_qos_no_power_off attribute
		is used for manipulating the PM QoS "no power off" flag.  If
		is used for manipulating the PM QoS "no power off" flag.  If
@@ -222,7 +222,7 @@ Description:


What:		/sys/devices/.../power/pm_qos_remote_wakeup
What:		/sys/devices/.../power/pm_qos_remote_wakeup
Date:		September 2012
Date:		September 2012
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/devices/.../power/pm_qos_remote_wakeup attribute
		The /sys/devices/.../power/pm_qos_remote_wakeup attribute
		is used for manipulating the PM QoS "remote wakeup required"
		is used for manipulating the PM QoS "remote wakeup required"
+11 −11
Original line number Original line Diff line number Diff line
What:		/sys/power/
What:		/sys/power/
Date:		August 2006
Date:		August 2006
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/power directory will contain files that will
		The /sys/power directory will contain files that will
		provide a unified interface to the power management
		provide a unified interface to the power management
@@ -8,7 +8,7 @@ Description:


What:		/sys/power/state
What:		/sys/power/state
Date:		August 2006
Date:		August 2006
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/power/state file controls the system power state.
		The /sys/power/state file controls the system power state.
		Reading from this file returns what states are supported,
		Reading from this file returns what states are supported,
@@ -22,7 +22,7 @@ Description:


What:		/sys/power/disk
What:		/sys/power/disk
Date:		September 2006
Date:		September 2006
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/power/disk file controls the operating mode of the
		The /sys/power/disk file controls the operating mode of the
		suspend-to-disk mechanism.  Reading from this file returns
		suspend-to-disk mechanism.  Reading from this file returns
@@ -67,7 +67,7 @@ Description:


What:		/sys/power/image_size
What:		/sys/power/image_size
Date:		August 2006
Date:		August 2006
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/power/image_size file controls the size of the image
		The /sys/power/image_size file controls the size of the image
		created by the suspend-to-disk mechanism.  It can be written a
		created by the suspend-to-disk mechanism.  It can be written a
@@ -84,7 +84,7 @@ Description:


What:		/sys/power/pm_trace
What:		/sys/power/pm_trace
Date:		August 2006
Date:		August 2006
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/power/pm_trace file controls the code which saves the
		The /sys/power/pm_trace file controls the code which saves the
		last PM event point in the RTC across reboots, so that you can
		last PM event point in the RTC across reboots, so that you can
@@ -133,7 +133,7 @@ Description:


What:		/sys/power/pm_async
What:		/sys/power/pm_async
Date:		January 2009
Date:		January 2009
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/power/pm_async file controls the switch allowing the
		The /sys/power/pm_async file controls the switch allowing the
		user space to enable or disable asynchronous suspend and resume
		user space to enable or disable asynchronous suspend and resume
@@ -146,7 +146,7 @@ Description:


What:		/sys/power/wakeup_count
What:		/sys/power/wakeup_count
Date:		July 2010
Date:		July 2010
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/power/wakeup_count file allows user space to put the
		The /sys/power/wakeup_count file allows user space to put the
		system into a sleep state while taking into account the
		system into a sleep state while taking into account the
@@ -161,7 +161,7 @@ Description:


What:		/sys/power/reserved_size
What:		/sys/power/reserved_size
Date:		May 2011
Date:		May 2011
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/power/reserved_size file allows user space to control
		The /sys/power/reserved_size file allows user space to control
		the amount of memory reserved for allocations made by device
		the amount of memory reserved for allocations made by device
@@ -175,7 +175,7 @@ Description:


What:		/sys/power/autosleep
What:		/sys/power/autosleep
Date:		April 2012
Date:		April 2012
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/power/autosleep file can be written one of the strings
		The /sys/power/autosleep file can be written one of the strings
		returned by reads from /sys/power/state.  If that happens, a
		returned by reads from /sys/power/state.  If that happens, a
@@ -192,7 +192,7 @@ Description:


What:		/sys/power/wake_lock
What:		/sys/power/wake_lock
Date:		February 2012
Date:		February 2012
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/power/wake_lock file allows user space to create
		The /sys/power/wake_lock file allows user space to create
		wakeup source objects and activate them on demand (if one of
		wakeup source objects and activate them on demand (if one of
@@ -219,7 +219,7 @@ Description:


What:		/sys/power/wake_unlock
What:		/sys/power/wake_unlock
Date:		February 2012
Date:		February 2012
Contact:	Rafael J. Wysocki <rjw@sisk.pl>
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
Description:
		The /sys/power/wake_unlock file allows user space to deactivate
		The /sys/power/wake_unlock file allows user space to deactivate
		wakeup sources created with the help of /sys/power/wake_lock.
		wakeup sources created with the help of /sys/power/wake_lock.
+1 −1
Original line number Original line Diff line number Diff line
@@ -4,4 +4,4 @@ CONFIG_ACPI_CUSTOM_DSDT builds the image into the kernel.


When to use this method is described in detail on the
When to use this method is described in detail on the
Linux/ACPI home page:
Linux/ACPI home page:
http://www.lesswatts.org/projects/acpi/overridingDSDT.php
https://01.org/linux-acpi/documentation/overriding-dsdt
Loading