Merge commit '0072a0c14d5b7cb72c611d396f143f5dcd73ebe2' into patchwork (14a4467a) · Commits · 戴 / test

.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

+62 −3

Original line number	Diff line number	Diff line
		@@ -856,7 +856,8 @@
		causing system reset or hang due to sending
		INIT from AP to BSP.

		disable_counter_freezing [HW]
		perf_v4_pmi= [X86,INTEL]
		Format: <bool>
		Disable Intel PMU counter freezing feature.
		The feature only exists starting from
		Arch Perfmon v4 (Skylake and newer).
		@@ -3504,6 +3505,10 @@
		before loading.
		See Documentation/blockdev/ramdisk.txt.

		psi= [KNL] Enable or disable pressure stall information
		tracking.
		Format: <bool>

		psmouse.proto= [HW,MOUSE] Highest PS2 mouse protocol extension to
		probe for; one of (bare\|imps\|exps\|lifebook\|any).
		psmouse.rate= [HW,MOUSE] Set desired mouse report rate, in reports
		@@ -4194,9 +4199,13 @@

		spectre_v2= [X86] Control mitigation of Spectre variant 2
		(indirect branch speculation) vulnerability.
		The default operation protects the kernel from
		user space attacks.

		on - unconditionally enable
		off - unconditionally disable
		on - unconditionally enable, implies
		spectre_v2_user=on
		off - unconditionally disable, implies
		spectre_v2_user=off
		auto - kernel detects whether your CPU model is
		vulnerable

		@@ -4206,6 +4215,12 @@
		CONFIG_RETPOLINE configuration option, and the
		compiler with which the kernel was built.

		Selecting 'on' will also enable the mitigation
		against user space to user space task attacks.

		Selecting 'off' will disable both the kernel and
		the user space protections.

		Specific mitigations can also be selected manually:

		retpoline - replace indirect branches
		@@ -4215,6 +4230,48 @@
		Not specifying this option is equivalent to
		spectre_v2=auto.

		spectre_v2_user=
		[X86] Control mitigation of Spectre variant 2
		(indirect branch speculation) vulnerability between
		user space tasks

		on - Unconditionally enable mitigations. Is
		enforced by spectre_v2=on

		off - Unconditionally disable mitigations. Is
		enforced by spectre_v2=off

		prctl - Indirect branch speculation is enabled,
		but mitigation can be enabled via prctl
		per thread. The mitigation control state
		is inherited on fork.

		prctl,ibpb
		- Like "prctl" above, but only STIBP is
		controlled per thread. IBPB is issued
		always when switching between different user
		space processes.

		seccomp
		- Same as "prctl" above, but all seccomp
		threads will enable the mitigation unless
		they explicitly opt out.

		seccomp,ibpb
		- Like "seccomp" above, but only STIBP is
		controlled per thread. IBPB is issued
		always when switching between different
		user space processes.

		auto - Kernel selects the mitigation depending on
		the available CPU features and vulnerability.

		Default mitigation:
		If CONFIG_SECCOMP=y then "seccomp", otherwise "prctl"

		Not specifying this option is equivalent to
		spectre_v2_user=auto.

		spec_store_bypass_disable=
		[HW] Control Speculative Store Bypass (SSB) Disable mitigation
		(Speculative Store Bypass vulnerability)
		@@ -4713,6 +4770,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

Admin message