summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-01-01 12:49:09 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2021-01-01 12:49:09 -0800
commit8b4805c68ae348b36a24a4c4b5c869c8971ab0c2 (patch)
tree33c3d984e1422c50e201a9493461f6c131925940 /block
parentdc3e24b214c50a2ac2dd3d2cc7fb88c9a1e842d4 (diff)
parentdc30432605bbbd486dfede3852ea4d42c40a84b4 (diff)
Merge tag 'block-5.11-2021-01-01' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe: "Two minor block fixes from this last week that should go into 5.11: - Add missing NOWAIT debugfs definition (Andres) - Fix kerneldoc warning introduced this merge window (Randy)" * tag 'block-5.11-2021-01-01' of git://git.kernel.dk/linux-block: block: add debugfs stanza for QUEUE_FLAG_NOWAIT fs: block_dev.c: fix kernel-doc warnings from struct block_device changes
Diffstat (limited to 'block')
-rw-r--r--block/blk-mq-debugfs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c
index 3094542e12ae..e21eed20a155 100644
--- a/block/blk-mq-debugfs.c
+++ b/block/blk-mq-debugfs.c
@@ -129,6 +129,7 @@ static const char *const blk_queue_flag_name[] = {
QUEUE_FLAG_NAME(PCI_P2PDMA),
QUEUE_FLAG_NAME(ZONE_RESETALL),
QUEUE_FLAG_NAME(RQ_ALLOC_TIME),
+ QUEUE_FLAG_NAME(NOWAIT),
};
#undef QUEUE_FLAG_NAME