Merge branch 'tip/tracing/urgent' of... (e02c4fd3) · Commits · e / devices / android_kernel_oneplus_sm7250

Documentation/ABI/testing/sysfs-block

+14 −0

Original line number	Diff line number	Diff line
		@@ -128,3 +128,17 @@ Description:
		preferred request size for workloads where sustained
		throughput is desired. If no optimal I/O size is
		reported this file contains 0.

		What: /sys/block/<disk>/queue/nomerges
		Date: January 2010
		Contact:
		Description:
		Standard I/O elevator operations include attempts to
		merge contiguous I/Os. For known random I/O loads these
		attempts will always fail and result in extra cycles
		being spent in the kernel. This allows one to turn off
		this behavior on one of two ways: When set to 1, complex
		merge checks are disabled, but the simple one-shot merges
		with the previous I/O request are enabled. When set to 2,
		all merge tries are disabled. The default value is 0 -
		which enables all types of merge tries.

Documentation/ABI/testing/sysfs-devices-power

0 → 100644

+79 −0

Original line number	Diff line number	Diff line
		What: /sys/devices/.../power/
		Date: January 2009
		Contact: Rafael J. Wysocki <rjw@sisk.pl>
		Description:
		The /sys/devices/.../power directory contains attributes
		allowing the user space to check and modify some power
		management related properties of given device.

		What: /sys/devices/.../power/wakeup
		Date: January 2009
		Contact: Rafael J. Wysocki <rjw@sisk.pl>
		Description:
		The /sys/devices/.../power/wakeup attribute allows the user
		space to check if the device is enabled to wake up the system
		from sleep states, such as the memory sleep state (suspend to
		RAM) and hibernation (suspend to disk), and to enable or disable
		it to do that as desired.

		Some devices support "wakeup" events, which are hardware signals
		used to activate the system from a sleep state. Such devices
		have one of the following two values for the sysfs power/wakeup
		file:

		+ "enabled\n" to issue the events;
		+ "disabled\n" not to do so;

		In that cases the user space can change the setting represented
		by the contents of this file by writing either "enabled", or
		"disabled" to it.

		For the devices that are not capable of generating system wakeup
		events this file contains "\n". In that cases the user space
		cannot modify the contents of this file and the device cannot be
		enabled to wake up the system.

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

		All devices have one of the following two values for the
		power/control file:

		+ "auto\n" to allow the device to be power managed at run time;
		+ "on\n" to prevent the device from being power managed;

		The default for all devices is "auto", which means that they may
		be subject to automatic power management, depending on their
		drivers. Changing this attribute to "on" prevents the driver
		from power managing the device at run time. Doing that while
		the device is suspended causes it to be woken up.

		What: /sys/devices/.../power/async
		Date: January 2009
		Contact: Rafael J. Wysocki <rjw@sisk.pl>
		Description:
		The /sys/devices/.../async attribute allows the user space to
		enable or diasble the device's suspend and resume callbacks to
		be executed asynchronously (ie. in separate threads, in parallel
		with the main suspend/resume thread) during system-wide power
		transitions (eg. suspend to RAM, hibernation).

		All devices have one of the following two values for the
		power/async file:

		+ "enabled\n" to permit the asynchronous suspend/resume;
		+ "disabled\n" to forbid it;

		The value of this attribute may be changed by writing either
		"enabled", or "disabled" to it.

		It generally is unsafe to permit the asynchronous suspend/resume
		of a device unless it is certain that all of the PM dependencies
		of the device are known to the PM core. However, for some
		devices this attribute is set to "enabled" by bus type code or
		device drivers and in that cases it should be safe to leave the
		default value.

Documentation/ABI/testing/sysfs-power

+13 −0

Original line number	Diff line number	Diff line
		@@ -101,3 +101,16 @@ Description:

		CAUTION: Using it will cause your machine's real-time (CMOS)
		clock to be set to a random invalid time after a resume.

		What: /sys/power/pm_async
		Date: January 2009
		Contact: Rafael J. Wysocki <rjw@sisk.pl>
		Description:
		The /sys/power/pm_async file controls the switch allowing the
		user space to enable or disable asynchronous suspend and resume
		of devices. If enabled, this feature will cause some device
		drivers' suspend and resume callbacks to be executed in parallel
		with each other and with the main suspend thread. It is enabled
		if this file contains "1", which is the default. It may be
		disabled by writing "0" to this file, in which case all devices
		will be suspended and resumed synchronously.

Documentation/DocBook/mac80211.tmpl

+1 −2

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ usage should require reading the full document.
		this though and the recommendation to allow only a single
		interface in STA mode at first!
		</para>
		!Finclude/net/mac80211.h ieee80211_if_init_conf
		!Finclude/net/mac80211.h ieee80211_vif
		</chapter>

		<chapter id="rx-tx">
		@@ -234,7 +234,6 @@ usage should require reading the full document.
		<title>Multiple queues and QoS support</title>
		<para>TBD</para>
		!Finclude/net/mac80211.h ieee80211_tx_queue_params
		!Finclude/net/mac80211.h ieee80211_tx_queue_stats
		</chapter>

		<chapter id="AP">

Documentation/DocBook/v4l/io.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -589,7 +589,8 @@ number of a video input as in &v4l2-input; field
		<entry></entry>
		<entry>A place holder for future extensions and custom
		(driver defined) buffer types
		<constant>V4L2_BUF_TYPE_PRIVATE</constant> and higher.</entry>
		<constant>V4L2_BUF_TYPE_PRIVATE</constant> and higher. Applications
		should set this to 0.</entry>
		</row>
		</tbody>
		</tgroup>