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

Commit a78b03bc authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'v4.20-rc3' into for-4.21/block 



Merge in -rc3 to resolve a few conflicts, but also to get a few
important fixes that have gone into mainline since the block
4.21 branch was forked off (most notably the SCSI queue issue,
which is both a conflict AND needed fix).

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parents fce15a60 9ff01193

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ Peter Oruba <peter@oruba.de> 
Peter Oruba <peter.oruba@amd.com>

Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>

Praveen BP <praveenbp@ti.com>

Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>

Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>

Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>

Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -2138,6 +2138,10 @@ E: paul@laufernet.com 
D: Soundblaster driver fixes, ISAPnP quirk

S: California, USA



N: Jarkko Lavinen

E: jarkko.lavinen@nokia.com

D: OMAP MMC support



N: Jonathan Layes

D: ARPD support

Documentation/ABI/testing/sysfs-class-led-trigger-pattern

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ Description: 
		  0-|   /             \/             \/

		    +---0----1----2----3----4----5----6------------> time (s)



		2. To make the LED go instantly from one brigntess value to another,

		we should use use zero-time lengths (the brightness must be same as

		2. To make the LED go instantly from one brightness value to another,

		we should use zero-time lengths (the brightness must be same as

		the previous tuple's). So the format should be:

		"brightness_1 duration_1 brightness_1 0 brightness_2 duration_2

		brightness_2 0 ...". For example:

Documentation/admin-guide/pm/cpufreq.rst

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ data structures necessary to handle the given policy and, possibly, to add 
a governor ``sysfs`` interface to it.  Next, the governor is started by

invoking its ``->start()`` callback.



That callback it expected to register per-CPU utilization update callbacks for

That callback is expected to register per-CPU utilization update callbacks for

all of the online CPUs belonging to the given policy with the CPU scheduler.

The utilization update callbacks will be invoked by the CPU scheduler on

important events, like task enqueue and dequeue, on every iteration of the

Documentation/cpu-freq/cpufreq-stats.txt

+5 −3
Original line number Diff line number Diff line
@@ -86,9 +86,11 @@ transitions. 
This will give a fine grained information about all the CPU frequency

transitions. The cat output here is a two dimensional matrix, where an entry

<i,j> (row i, column j) represents the count of number of transitions from 

Freq_i to Freq_j. Freq_i is in descending order with increasing rows and 

Freq_j is in descending order with increasing columns. The output here also 

contains the actual freq values for each row and column for better readability.

Freq_i to Freq_j. Freq_i rows and Freq_j columns follow the sorting order in

which the driver has provided the frequency table initially to the cpufreq core

and so can be sorted (ascending or descending) or unsorted.  The output here

also contains the actual freq values for each row and column for better

readability.



If the transition table is bigger than PAGE_SIZE, reading this will

return an -EFBIG error.