Merge tag 'asoc-v5.5-2' of... (09578eac) · Commits · 戴 / test

.mailmap

+7 −1

Original line number	Diff line number	Diff line
		@@ -108,6 +108,10 @@ Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
		Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
		Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
		<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
		Jayachandran C <c.jayachandran@gmail.com> <jayachandranc@netlogicmicro.com>
		Jayachandran C <c.jayachandran@gmail.com> <jchandra@broadcom.com>
		Jayachandran C <c.jayachandran@gmail.com> <jchandra@digeo.com>
		Jayachandran C <c.jayachandran@gmail.com> <jnair@caviumnetworks.com>
		Jean Tourrilhes <jt@hpl.hp.com>
		<jean-philippe@linaro.org> <jean-philippe.brucker@arm.com>
		Jeff Garzik <jgarzik@pretzel.yyz.us>
		@@ -196,7 +200,8 @@ Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de>
		Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>
		Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
		Patrick Mochel <mochel@digitalimplant.org>
		Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
		Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>
		Paul Burton <paulburton@kernel.org> <paul.burton@mips.com>
		Peter A Jonsson <pj@ludd.ltu.se>
		Peter Oruba <peter@oruba.de>
		Peter Oruba <peter.oruba@amd.com>
		@@ -229,6 +234,7 @@ Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
		Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
		Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>
		Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
		Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>
		Simon Kelley <simon@thekelleys.org.uk>
		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
		Stephen Hemminger <shemminger@osdl.org>

CREDITS

+4 −0

Original line number	Diff line number	Diff line
		@@ -1637,6 +1637,10 @@ S: Panoramastrasse 18
		S: D-69126 Heidelberg
		S: Germany

		N: Simon Horman
		M: horms@verge.net.au
		D: Renesas ARM/ARM64 SoC maintainer

		N: Christopher Horn
		E: chorn@warwick.net
		D: Miscellaneous sysctl hacks

Documentation/ABI/testing/sysfs-devices-system-cpu

+2 −0

Original line number	Diff line number	Diff line
		@@ -486,6 +486,8 @@ What: /sys/devices/system/cpu/vulnerabilities
		/sys/devices/system/cpu/vulnerabilities/spec_store_bypass
		/sys/devices/system/cpu/vulnerabilities/l1tf
		/sys/devices/system/cpu/vulnerabilities/mds
		/sys/devices/system/cpu/vulnerabilities/tsx_async_abort
		/sys/devices/system/cpu/vulnerabilities/itlb_multihit
		Date: January 2018
		Contact: Linux kernel mailing list <linux-kernel@vger.kernel.org>
		Description: Information about CPU vulnerabilities

Documentation/admin-guide/cgroup-v2.rst

+14 −6

Original line number	Diff line number	Diff line
		@@ -615,8 +615,8 @@ on an IO device and is an example of this type.
		Protections
		-----------

		A cgroup is protected to be allocated upto the configured amount of
		the resource if the usages of all its ancestors are under their
		A cgroup is protected upto the configured amount of the resource
		as long as the usages of all its ancestors are under their
		protected levels. Protections can be hard guarantees or best effort
		soft boundaries. Protections can also be over-committed in which case
		only upto the amount available to the parent is protected among
		@@ -1096,7 +1096,10 @@ PAGE_SIZE multiple when read back.
		is within its effective min boundary, the cgroup's memory
		won't be reclaimed under any conditions. If there is no
		unprotected reclaimable memory available, OOM killer
		is invoked.
		is invoked. Above the effective min boundary (or
		effective low boundary if it is higher), pages are reclaimed
		proportionally to the overage, reducing reclaim pressure for
		smaller overages.

		Effective min boundary is limited by memory.min values of
		all ancestor cgroups. If there is memory.min overcommitment
		@@ -1118,7 +1121,10 @@ PAGE_SIZE multiple when read back.
		Best-effort memory protection. If the memory usage of a
		cgroup is within its effective low boundary, the cgroup's
		memory won't be reclaimed unless memory can be reclaimed
		from unprotected cgroups.
		from unprotected cgroups. Above the effective low boundary (or
		effective min boundary if it is higher), pages are reclaimed
		proportionally to the overage, reducing reclaim pressure for
		smaller overages.

		Effective low boundary is limited by memory.low values of
		all ancestor cgroups. If there is memory.low overcommitment
		@@ -2482,8 +2488,10 @@ system performance due to overreclaim, to the point where the feature
		becomes self-defeating.

		The memory.low boundary on the other hand is a top-down allocated
		reserve. A cgroup enjoys reclaim protection when it's within its low,
		which makes delegation of subtrees possible.
		reserve. A cgroup enjoys reclaim protection when it's within its
		effective low, which makes delegation of subtrees possible. It also
		enjoys having reclaim pressure proportional to its overage when
		above its effective low.

		The original high boundary, the hard limit, is defined as a strict
		limit that can not budge, even if the OOM killer has to be called.

Documentation/admin-guide/hw-vuln/index.rst

+2 −0

Original line number	Diff line number	Diff line
		@@ -12,3 +12,5 @@ are configurable at compile, boot or run time.
		spectre
		l1tf
		mds
		tsx_async_abort
		multihit.rst

Admin message