Merge branch 'sched/urgent' into sched/core, to pick up fixes (151aeab7) · Commits · e / devices / android_kernel_fairphone_FP4

.mailmap

+2 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,8 @@ Jacob Shin <Jacob.Shin@amd.com>
		James Bottomley <jejb@mulgrave.(none)>
		James Bottomley <jejb@titanic.il.steeleye.com>
		James E Wilson <wilson@specifix.com>
		James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
		James Hogan <jhogan@kernel.org> <james@albanarts.com>
		James Ketrenos <jketreno@io.(none)>
		Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
		<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>

Documentation/ABI/testing/sysfs-power

+1 −1

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@ Description:

		What; /sys/power/pm_trace_dev_match
		Date: October 2010
		Contact: James Hogan <james@albanarts.com>
		Contact: James Hogan <jhogan@kernel.org>
		Description:
		The /sys/power/pm_trace_dev_match file contains the name of the
		device associated with the last PM event point saved in the RTC

Documentation/core-api/workqueue.rst

+6 −6

Original line number	Diff line number	Diff line
		@@ -39,8 +39,8 @@ up.
		Although MT wq wasted a lot of resource, the level of concurrency
		provided was unsatisfactory. The limitation was common to both ST and
		MT wq albeit less severe on MT. Each wq maintained its own separate
		worker pool. A MT wq could provide only one execution context per CPU
		while a ST wq one for the whole system. Work items had to compete for
		worker pool. An MT wq could provide only one execution context per CPU
		while an ST wq one for the whole system. Work items had to compete for
		those very limited execution contexts leading to various problems
		including proneness to deadlocks around the single execution context.

		@@ -151,7 +151,7 @@ Application Programming Interface (API)

		``alloc_workqueue()`` allocates a wq. The original
		``create_*workqueue()`` functions are deprecated and scheduled for
		removal. ``alloc_workqueue()`` takes three arguments - @``name``,
		removal. ``alloc_workqueue()`` takes three arguments - ``@name``,
		``@flags`` and ``@max_active``. ``@name`` is the name of the wq and
		also used as the name of the rescuer thread if there is one.

		@@ -197,7 +197,7 @@ resources, scheduled and executed.
		served by worker threads with elevated nice level.

		Note that normal and highpri worker-pools don't interact with
		each other. Each maintain its separate pool of workers and
		each other. Each maintains its separate pool of workers and
		implements concurrency management among its workers.

		``WQ_CPU_INTENSIVE``
		@@ -249,8 +249,8 @@ unbound worker-pools and only one work item could be active at any given
		time thus achieving the same ordering property as ST wq.

		In the current implementation the above configuration only guarantees
		ST behavior within a given NUMA node. Instead alloc_ordered_queue should
		be used to achieve system wide ST behavior.
		ST behavior within a given NUMA node. Instead ``alloc_ordered_queue()`` should
		be used to achieve system-wide ST behavior.


		Example Execution Scenarios

Documentation/device-mapper/dm-raid.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -344,3 +344,4 @@ Version History
		(wrong raid10_copies/raid10_format sequence)
		1.11.1 Add raid4/5/6 journal write-back support via journal_mode option
		1.12.1 fix for MD deadlock between mddev_suspend() and md_write_start() available
		1.13.0 Fix dev_health status at end of "recover" (was 'a', now 'A')

Documentation/devicetree/bindings/leds/ams,as3645a.txt

+18 −10

Original line number	Diff line number	Diff line
		@@ -15,11 +15,14 @@ Required properties

		compatible : Must be "ams,as3645a".
		reg : The I2C address of the device. Typically 0x30.
		#address-cells : 1
		#size-cells : 0


		Required properties of the "flash" child node
		=============================================
		Required properties of the flash child node (0)
		===============================================

		reg: 0
		flash-timeout-us: Flash timeout in microseconds. The value must be in
		the range [100000, 850000] and divisible by 50000.
		flash-max-microamp: Maximum flash current in microamperes. Has to be
		@@ -33,20 +36,21 @@ ams,input-max-microamp: Maximum flash controller input current. The
		and divisible by 50000.


		Optional properties of the "flash" child node
		=============================================
		Optional properties of the flash child node
		===========================================

		label : The label of the flash LED.


		Required properties of the "indicator" child node
		=================================================
		Required properties of the indicator child node (1)
		===================================================

		reg: 1
		led-max-microamp: Maximum indicator current. The allowed values are
		2500, 5000, 7500 and 10000.

		Optional properties of the "indicator" child node
		=================================================
		Optional properties of the indicator child node
		===============================================

		label : The label of the indicator LED.

		@@ -55,16 +59,20 @@ Example
		=======

		as3645a@30 {
		#address-cells: 1
		#size-cells: 0
		reg = <0x30>;
		compatible = "ams,as3645a";
		flash {
		flash@0 {
		reg = <0x0>;
		flash-timeout-us = <150000>;
		flash-max-microamp = <320000>;
		led-max-microamp = <60000>;
		ams,input-max-microamp = <1750000>;
		label = "as3645a:flash";
		};
		indicator {
		indicator@1 {
		reg = <0x1>;
		led-max-microamp = <10000>;
		label = "as3645a:indicator";
		};