diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-24 04:58:30 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-24 04:58:30 +0200 |
commit | 24a81a2c258177ba334838a372651f784953b03a (patch) | |
tree | 6c3ea896b8a690ed43def034f3f5b885069397b4 /block/bfq-iosched.h | |
parent | Revert "x86/hyper-v: include hyperv/ only when CONFIG_HYPERV is set" (diff) | |
parent | Linux 4.13-rc2 (diff) | |
download | linux-24a81a2c258177ba334838a372651f784953b03a.tar.xz linux-24a81a2c258177ba334838a372651f784953b03a.zip |
Merge 4.13-rc2 into char-misc-next
We want the char/misc driver fixes in here as well to handle future
changes.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'block/bfq-iosched.h')
-rw-r--r-- | block/bfq-iosched.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index 8fd83b885774..63e771ab56d8 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -52,7 +52,7 @@ struct bfq_entity; struct bfq_service_tree { /* tree for active entities (i.e., those backlogged) */ struct rb_root active; - /* tree for idle entities (i.e., not backlogged, with V <= F_i)*/ + /* tree for idle entities (i.e., not backlogged, with V < F_i)*/ struct rb_root idle; /* idle entity with minimum F_i */ |