From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Jan 2021 20:49:09 +0000 (-0800)
Subject: Merge tag 'block-5.11-2021-01-01' of git://git.kernel.dk/linux-block
X-Git-Tag: v5.15.73~12876
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b4805c68ae348b36a24a4c4b5c869c8971ab0c2;p=platform%2Fkernel%2Flinux-rpi.git

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
---

8b4805c68ae348b36a24a4c4b5c869c8971ab0c2