Merge remote-tracking branch 'torvalds/master' into perf/core (b1aa3db2) · Commits · jan.koester / Linux

.mailmap

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -90,11 +90,16 @@ Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>
	Frank Zago <fzago@systemfabricworks.com>		Frank Zago <fzago@systemfabricworks.com>
	Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>		Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>
	Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>		Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>
			Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>
			Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>
			Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@linux.vnet.ibm.com>
	Greg Kroah-Hartman <greg@echidna.(none)>		Greg Kroah-Hartman <greg@echidna.(none)>
	Greg Kroah-Hartman <gregkh@suse.de>		Greg Kroah-Hartman <gregkh@suse.de>
	Greg Kroah-Hartman <greg@kroah.com>		Greg Kroah-Hartman <greg@kroah.com>
	Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>		Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>
	Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>		Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>
			Heiko Carstens <hca@linux.ibm.com> <h.carstens@de.ibm.com>
			Heiko Carstens <hca@linux.ibm.com> <heiko.carstens@de.ibm.com>
	Henk Vergonet <Henk.Vergonet@gmail.com>		Henk Vergonet <Henk.Vergonet@gmail.com>
	Henrik Kretzschmar <henne@nachtwindheim.de>		Henrik Kretzschmar <henne@nachtwindheim.de>
	Henrik Rydberg <rydberg@bitmath.org>		Henrik Rydberg <rydberg@bitmath.org>
	@@ -193,6 +198,9 @@ Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>
	Mayuresh Janorkar <mayur@ti.com>		Mayuresh Janorkar <mayur@ti.com>
	Michael Buesch <m@bues.ch>		Michael Buesch <m@bues.ch>
	Michel Dänzer <michel@tungstengraphics.com>		Michel Dänzer <michel@tungstengraphics.com>
			Mike Rapoport <rppt@kernel.org> <mike@compulab.co.il>
			Mike Rapoport <rppt@kernel.org> <mike.rapoport@gmail.com>
			Mike Rapoport <rppt@kernel.org> <rppt@linux.ibm.com>
	Miodrag Dinic <miodrag.dinic@mips.com> <miodrag.dinic@imgtec.com>		Miodrag Dinic <miodrag.dinic@mips.com> <miodrag.dinic@imgtec.com>
	Miquel Raynal <miquel.raynal@bootlin.com> <miquel.raynal@free-electrons.com>		Miquel Raynal <miquel.raynal@bootlin.com> <miquel.raynal@free-electrons.com>
	Mitesh shah <mshah@teja.com>		Mitesh shah <mshah@teja.com>

Documentation/ABI/testing/debugfs-driver-habanalabs

+10 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,16 @@ Description: Allow the root user to disable/enable in runtime the clock
	gating mechanism in Gaudi. Due to how Gaudi is built, the		gating mechanism in Gaudi. Due to how Gaudi is built, the
	clock gating needs to be disabled in order to access the		clock gating needs to be disabled in order to access the
	registers of the TPC and MME engines. This is sometimes needed		registers of the TPC and MME engines. This is sometimes needed
	during debug by the user and hence the user needs this option		during debug by the user and hence the user needs this option.
			The user can supply a bitmask value, each bit represents
			a different engine to disable/enable its clock gating feature.
			The bitmask is composed of 20 bits:
			0 - 7 : DMA channels
			8 - 11 : MME engines
			12 - 19 : TPC engines
			The bit's location of a specific engine can be determined
			using (1 << GAUDI_ENGINE_ID_). GAUDI_ENGINE_ID_ values
			are defined in uapi habanalabs.h file in enum gaudi_engine_id

	What: /sys/kernel/debug/habanalabs/hl<n>/command_buffers		What: /sys/kernel/debug/habanalabs/hl<n>/command_buffers
	Date: Jan 2019		Date: Jan 2019

Documentation/admin-guide/README.rst

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -258,7 +258,7 @@ Configuring the kernel
	Compiling the kernel		Compiling the kernel
	--------------------		--------------------

	- Make sure you have at least gcc 4.6 available.		- Make sure you have at least gcc 4.9 available.
	For more information, refer to :ref:`Documentation/process/changes.rst <changes>`.		For more information, refer to :ref:`Documentation/process/changes.rst <changes>`.

	Please note that you can still run a.out user programs with this kernel.		Please note that you can still run a.out user programs with this kernel.

Documentation/arm64/cpu-feature-registers.rst

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -171,6 +171,7 @@ infrastructure:


	3) ID_AA64PFR1_EL1 - Processor Feature Register 1		3) ID_AA64PFR1_EL1 - Processor Feature Register 1

	+------------------------------+---------+---------+		+------------------------------+---------+---------+
	\| Name \| bits \| visible \|		\| Name \| bits \| visible \|
	+------------------------------+---------+---------+		+------------------------------+---------+---------+
	@@ -181,6 +182,7 @@ infrastructure:


	4) MIDR_EL1 - Main ID Register		4) MIDR_EL1 - Main ID Register

	+------------------------------+---------+---------+		+------------------------------+---------+---------+
	\| Name \| bits \| visible \|		\| Name \| bits \| visible \|
	+------------------------------+---------+---------+		+------------------------------+---------+---------+

Documentation/block/bfq-iosched.rst

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -492,13 +492,6 @@ set max_budget to higher values than those to which BFQ would have set
	it with auto-tuning. An alternative way to achieve this goal is to		it with auto-tuning. An alternative way to achieve this goal is to
	just increase the value of timeout_sync, leaving max_budget equal to 0.		just increase the value of timeout_sync, leaving max_budget equal to 0.

	weights
	-------

	Read-only parameter, used to show the weights of the currently active
	BFQ queues.


	4. Group scheduling with BFQ		4. Group scheduling with BFQ
	============================		============================

	@@ -566,7 +559,7 @@ Parameters to set
	For each group, there is only the following parameter to set.		For each group, there is only the following parameter to set.

	weight (namely blkio.bfq.weight or io.bfq-weight): the weight of the		weight (namely blkio.bfq.weight or io.bfq-weight): the weight of the
	group inside its parent. Available values: 1..10000 (default 100). The		group inside its parent. Available values: 1..1000 (default 100). The
	linear mapping between ioprio and weights, described at the beginning		linear mapping between ioprio and weights, described at the beginning
	of the tunable section, is still valid, but all weights higher than		of the tunable section, is still valid, but all weights higher than
	IOPRIO_BE_NR*10 are mapped to ioprio 0.		IOPRIO_BE_NR*10 are mapped to ioprio 0.