Merge tag 'v5.17-rc2' into char-misc-next (7ab004db) · Commits · jan.koester / Linux

.mailmap

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -70,6 +70,7 @@ Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>
	Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>		Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>
	Brian Avery <b.avery@hp.com>		Brian Avery <b.avery@hp.com>
	Brian King <brking@us.ibm.com>		Brian King <brking@us.ibm.com>
			Brian Silverman <bsilver16384@gmail.com> <brian.silverman@bluerivertech.com>
	Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>		Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
	Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>		Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
	Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>		Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>

Documentation/accounting/psi.rst

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -92,7 +92,8 @@ Triggers can be set on more than one psi metric and more than one trigger
	for the same psi metric can be specified. However for each trigger a separate		for the same psi metric can be specified. However for each trigger a separate
	file descriptor is required to be able to poll it separately from others,		file descriptor is required to be able to poll it separately from others,
	therefore for each trigger a separate open() syscall should be made even		therefore for each trigger a separate open() syscall should be made even
	when opening the same psi interface file.		when opening the same psi interface file. Write operations to a file descriptor
			with an already existing psi trigger will fail with EBUSY.

	Monitors activate only when system enters stall state for the monitored		Monitors activate only when system enters stall state for the monitored
	psi metric and deactivates upon exit from the stall state. While system is		psi metric and deactivates upon exit from the stall state. While system is

Documentation/admin-guide/gpio/index.rst

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -10,6 +10,7 @@ gpio
	gpio-aggregator		gpio-aggregator
	sysfs		sysfs
	gpio-mockup		gpio-mockup
			gpio-sim

	.. only:: subproject and html		.. only:: subproject and html

Documentation/arm/marvell.rst

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -266,10 +266,12 @@ Avanta family
	-------------		-------------

	Flavors:		Flavors:
			- 88F6500
	- 88F6510		- 88F6510
	- 88F6530P		- 88F6530P
	- 88F6550		- 88F6550
	- 88F6560		- 88F6560
			- 88F6601

	Homepage:		Homepage:
	https://web.archive.org/web/20181005145041/http://www.marvell.com/broadband/		https://web.archive.org/web/20181005145041/http://www.marvell.com/broadband/

Documentation/arm64/silicon-errata.rst

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -52,6 +52,12 @@ stable kernels.
	\| Allwinner \| A64/R18 \| UNKNOWN1 \| SUN50I_ERRATUM_UNKNOWN1 \|		\| Allwinner \| A64/R18 \| UNKNOWN1 \| SUN50I_ERRATUM_UNKNOWN1 \|
	+----------------+-----------------+-----------------+-----------------------------+		+----------------+-----------------+-----------------+-----------------------------+
	+----------------+-----------------+-----------------+-----------------------------+		+----------------+-----------------+-----------------+-----------------------------+
			\| ARM \| Cortex-A510 \| #2064142 \| ARM64_ERRATUM_2064142 \|
			+----------------+-----------------+-----------------+-----------------------------+
			\| ARM \| Cortex-A510 \| #2038923 \| ARM64_ERRATUM_2038923 \|
			+----------------+-----------------+-----------------+-----------------------------+
			\| ARM \| Cortex-A510 \| #1902691 \| ARM64_ERRATUM_1902691 \|
			+----------------+-----------------+-----------------+-----------------------------+
	\| ARM \| Cortex-A53 \| #826319 \| ARM64_ERRATUM_826319 \|		\| ARM \| Cortex-A53 \| #826319 \| ARM64_ERRATUM_826319 \|
	+----------------+-----------------+-----------------+-----------------------------+		+----------------+-----------------+-----------------+-----------------------------+
	\| ARM \| Cortex-A53 \| #827319 \| ARM64_ERRATUM_827319 \|		\| ARM \| Cortex-A53 \| #827319 \| ARM64_ERRATUM_827319 \|
	@@ -92,12 +98,18 @@ stable kernels.
	+----------------+-----------------+-----------------+-----------------------------+		+----------------+-----------------+-----------------+-----------------------------+
	\| ARM \| Cortex-A77 \| #1508412 \| ARM64_ERRATUM_1508412 \|		\| ARM \| Cortex-A77 \| #1508412 \| ARM64_ERRATUM_1508412 \|
	+----------------+-----------------+-----------------+-----------------------------+		+----------------+-----------------+-----------------+-----------------------------+
			\| ARM \| Cortex-A510 \| #2051678 \| ARM64_ERRATUM_2051678 \|
			+----------------+-----------------+-----------------+-----------------------------+
	\| ARM \| Cortex-A710 \| #2119858 \| ARM64_ERRATUM_2119858 \|		\| ARM \| Cortex-A710 \| #2119858 \| ARM64_ERRATUM_2119858 \|
	+----------------+-----------------+-----------------+-----------------------------+		+----------------+-----------------+-----------------+-----------------------------+
	\| ARM \| Cortex-A710 \| #2054223 \| ARM64_ERRATUM_2054223 \|		\| ARM \| Cortex-A710 \| #2054223 \| ARM64_ERRATUM_2054223 \|
	+----------------+-----------------+-----------------+-----------------------------+		+----------------+-----------------+-----------------+-----------------------------+
	\| ARM \| Cortex-A710 \| #2224489 \| ARM64_ERRATUM_2224489 \|		\| ARM \| Cortex-A710 \| #2224489 \| ARM64_ERRATUM_2224489 \|
	+----------------+-----------------+-----------------+-----------------------------+		+----------------+-----------------+-----------------+-----------------------------+
			\| ARM \| Cortex-X2 \| #2119858 \| ARM64_ERRATUM_2119858 \|
			+----------------+-----------------+-----------------+-----------------------------+
			\| ARM \| Cortex-X2 \| #2224489 \| ARM64_ERRATUM_2224489 \|
			+----------------+-----------------+-----------------+-----------------------------+
	\| ARM \| Neoverse-N1 \| #1188873,1418040\| ARM64_ERRATUM_1418040 \|		\| ARM \| Neoverse-N1 \| #1188873,1418040\| ARM64_ERRATUM_1418040 \|
	+----------------+-----------------+-----------------+-----------------------------+		+----------------+-----------------+-----------------+-----------------------------+
	\| ARM \| Neoverse-N1 \| #1349291 \| N/A \|		\| ARM \| Neoverse-N1 \| #1349291 \| N/A \|