linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/1] doc: kernel-parameters.txt: fix documentation of elevator parameter
@ 2019-02-03 20:00 Otto Sabart
  2019-02-06 23:46 ` Jonathan Corbet
  0 siblings, 1 reply; 2+ messages in thread
From: Otto Sabart @ 2019-02-03 20:00 UTC (permalink / raw)
  To: linux-kernel, linux-doc; +Cc: Jonathan Corbet, Jens Axboe

[-- Attachment #1: Type: text/plain, Size: 1464 bytes --]

Legacy IO schedulers (cfq, deadline and noop) were removed in
f382fb0bcef4.

The documentation for deadline was retained because it carries over to
mq-deadline as well, but location of the doc file was changed over time.

The old iosched algorithms were removed from elevator= kernel parameter
and mq-deadline, kyber and bfq were added with a reference to their
documentation.

Fixes: f382fb0bcef4 ("block: remove legacy IO schedulers")
Signed-off-by: Otto Sabart <ottosabart@seberm.com>
---
 Documentation/admin-guide/kernel-parameters.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index b799bcf67d7b..2238fb3c7dcf 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1182,9 +1182,10 @@
 			arch/x86/kernel/cpu/cpufreq/elanfreq.c.
 
 	elevator=	[IOSCHED]
-			Format: {"cfq" | "deadline" | "noop"}
-			See Documentation/block/cfq-iosched.txt and
-			Documentation/block/deadline-iosched.txt for details.
+			Format: { "mq-deadline" | "kyber" | "bfq" }
+			See Documentation/block/deadline-iosched.txt,
+			Documentation/block/kyber-iosched.txt and
+			Documentation/block/bfq-iosched.txt for details.
 
 	elfcorehdr=[size[KMG]@]offset[KMG] [IA64,PPC,SH,X86,S390]
 			Specifies physical address of start of kernel core
-- 
2.17.2


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 1/1] doc: kernel-parameters.txt: fix documentation of elevator parameter
  2019-02-03 20:00 [PATCH 1/1] doc: kernel-parameters.txt: fix documentation of elevator parameter Otto Sabart
@ 2019-02-06 23:46 ` Jonathan Corbet
  0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Corbet @ 2019-02-06 23:46 UTC (permalink / raw)
  To: Otto Sabart; +Cc: linux-kernel, linux-doc, Jens Axboe

On Sun, 3 Feb 2019 21:00:19 +0100
Otto Sabart <ottosabart@seberm.com> wrote:

> Legacy IO schedulers (cfq, deadline and noop) were removed in
> f382fb0bcef4.
> 
> The documentation for deadline was retained because it carries over to
> mq-deadline as well, but location of the doc file was changed over time.
> 
> The old iosched algorithms were removed from elevator= kernel parameter
> and mq-deadline, kyber and bfq were added with a reference to their
> documentation.
> 
> Fixes: f382fb0bcef4 ("block: remove legacy IO schedulers")
> Signed-off-by: Otto Sabart <ottosabart@seberm.com>
> ---
>  Documentation/admin-guide/kernel-parameters.txt | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
> index b799bcf67d7b..2238fb3c7dcf 100644
> --- a/Documentation/admin-guide/kernel-parameters.txt
> +++ b/Documentation/admin-guide/kernel-parameters.txt
> @@ -1182,9 +1182,10 @@
>  			arch/x86/kernel/cpu/cpufreq/elanfreq.c.
>  
>  	elevator=	[IOSCHED]
> -			Format: {"cfq" | "deadline" | "noop"}
> -			See Documentation/block/cfq-iosched.txt and
> -			Documentation/block/deadline-iosched.txt for details.
> +			Format: { "mq-deadline" | "kyber" | "bfq" }
> +			See Documentation/block/deadline-iosched.txt,
> +			Documentation/block/kyber-iosched.txt and
> +			Documentation/block/bfq-iosched.txt for details.

Applied, thanks.

jon

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-02-06 23:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-03 20:00 [PATCH 1/1] doc: kernel-parameters.txt: fix documentation of elevator parameter Otto Sabart
2019-02-06 23:46 ` Jonathan Corbet

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).