Merge tag 'block-5.15-2021-10-09' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 Oct 2021 21:51:59 +0000 (14:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 Oct 2021 21:51:59 +0000 (14:51 -0700)
commit50eb0a06e6cae01d8a8d63770030d01ac2fb572a
tree31d45b247b399ff4cb44207cbcfee77950aff94e
parentc75de8453c3e2f8a8fcee9171118b7da29d3fb9c
parent1dbdd99b511c966be9147ad72991a2856ac76f22
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()