Commit 986fb2e0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.20-rc4 into char-misc-next 



We want the char/misc fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 24438e46 2e6e902d

.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

+8 −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
@@ -2200,6 +2204,10 @@ S: Post Office Box 371 
S: North Little Rock, Arkansas 72115

S: USA



N: Christopher Li

E: sparse@chrisli.org

D: Sparse maintainer 2009 - 2018



N: Stephan Linz

E: linz@mazet.de

E: Stephan.Linz@gmx.de

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/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -4713,6 +4713,8 @@ 
					prevent spurious wakeup);

				n = USB_QUIRK_DELAY_CTRL_MSG (Device needs a

					pause after every control message);

				o = USB_QUIRK_HUB_SLOW_RESET (Hub needs extra

					delay after resetting its port);

			Example: quirks=0781:5580:bk,0a5c:5834:gij



	usbhid.mousepoll=

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