From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 9 Oct 2021 21:51:59 +0000 (-0700)
Subject: Merge tag 'block-5.15-2021-10-09' of git://git.kernel.dk/linux-block
X-Git-Tag: v5.15-rc5~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50eb0a06e6cae01d8a8d63770030d01ac2fb572a;p=thirdparty%2Flinux.git

Merge tag 'block-5.15-2021-10-09' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:
 "Two small fixes for this release:

   - Add missing QUEUE_FLAG_HCTX_ACTIVE in the debugfs handling
     (Johannes)

   - Fix double free / UAF issue in __alloc_disk_node (Tetsuo)"

* tag 'block-5.15-2021-10-09' of git://git.kernel.dk/linux-block:
  block: decode QUEUE_FLAG_HCTX_ACTIVE in debugfs output
  block: genhd: fix double kfree() in __alloc_disk_node()
---

50eb0a06e6cae01d8a8d63770030d01ac2fb572a