diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-01 21:49:09 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-01 21:49:09 +0100 |
commit | 8b4805c68ae348b36a24a4c4b5c869c8971ab0c2 (patch) | |
tree | 33c3d984e1422c50e201a9493461f6c131925940 /drivers/firmware/google | |
parent | Merge tag 'io_uring-5.11-2021-01-01' of git://git.kernel.dk/linux-block (diff) | |
parent | block: add debugfs stanza for QUEUE_FLAG_NOWAIT (diff) | |
download | linux-8b4805c68ae348b36a24a4c4b5c869c8971ab0c2.tar.xz linux-8b4805c68ae348b36a24a4c4b5c869c8971ab0c2.zip |
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 'drivers/firmware/google')
0 files changed, 0 insertions, 0 deletions