Merge tag 'block-5.11-2021-01-01' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Jan 2021 20:49:09 +0000 (12:49 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Jan 2021 20:49:09 +0000 (12:49 -0800)
commit8b4805c68ae348b36a24a4c4b5c869c8971ab0c2
tree33c3d984e1422c50e201a9493461f6c131925940
parentdc3e24b214c50a2ac2dd3d2cc7fb88c9a1e842d4
parentdc30432605bbbd486dfede3852ea4d42c40a84b4
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