Merge branch 'sched/urgent' (015dc089) · Commits · 戴 / test

.mailmap

+5 −0

Original line number	Diff line number	Diff line
		@@ -90,11 +90,16 @@ Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>
		Frank Zago <fzago@systemfabricworks.com>
		Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.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 <gregkh@suse.de>
		Greg Kroah-Hartman <greg@kroah.com>
		Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>
		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>
		Henrik Kretzschmar <henne@nachtwindheim.de>
		Henrik Rydberg <rydberg@bitmath.org>

+1 −1

Original line number	Diff line number	Diff line
		@@ -258,7 +258,7 @@ Configuring 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>`.

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

+2 −0

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


		3) ID_AA64PFR1_EL1 - Processor Feature Register 1

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


		4) MIDR_EL1 - Main ID Register

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

+1 −8

Original line number	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
		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
		============================

		@@ -566,7 +559,7 @@ Parameters 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
		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
		of the tunable section, is still valid, but all weights higher than
		IOPRIO_BE_NR*10 are mapped to ioprio 0.

+8 −0

Original line number	Diff line number	Diff line
		@@ -204,6 +204,14 @@ Returns the maximum size of a mapping for the device. The size parameter
		of the mapping functions like dma_map_single(), dma_map_page() and
		others should not be larger than the returned value.

		::

		bool
		dma_need_sync(struct device *dev, dma_addr_t dma_addr);

		Returns %true if dma_sync_single_for_{device,cpu} calls are required to
		transfer memory ownership. Returns %false if those calls can be skipped.

		::

		unsigned long