And revert redundant patches of nbd to resolve conflict.
Christoph Hellwig (9):
block: add blk_alloc_disk and blk_cleanup_disk APIs
blk-mq: add the blk_mq_alloc_disk APIs
loop: use blk_mq_alloc_disk and blk_cleanup_disk
loop: fix order of cleaning up the queue and freeing the tagset
nbd: use blk_mq_alloc_disk and blk_cleanup_disk
block: add a flag to make put_disk on partially initalized disks safer
nvme: use blk_mq_alloc_disk
brd: convert to blk_alloc_disk/blk_cleanup_disk
ubi: use blk_mq_alloc_disk and blk_cleanup_disk
Dan Carpenter (1):
blk-mq: fix an IS_ERR() vs NULL bug
Li Lingfeng (1):
nbd: fix uaf in nbd_open
Li Nan (1):
nbd: Revert redundant patches of nbd first_minor
Luis Chamberlain (7):
loop: add error handling support for add_disk()
nbd: add error handling support for add_disk()
nvme: add error handling support for add_disk()
block/brd: add error handling support for add_disk()
scsi: sd: Add error handling support for add_disk()
scsi: sr: Add error handling support for add_disk()
mtd/ubi/block: add error handling support for add_disk()
Wang Qing (1):
nbd: fix order of cleaning up the queue and freeing the tagset
Zhong Jinghua (3):
scsi: sd: Clean up sdkp if device_add_disk() failed
mtd/ubi/block: Fix null pointer dereference issue in error path
mtd/ubi/block: Fix uaf problem in ubiblock_cleanup
include/linux/blk-mq.h | 12 +++++
include/linux/genhd.h | 23 +++++++++
block/blk-mq.c | 19 ++++++++
block/genhd.c | 42 +++++++++++++++-
drivers/block/brd.c | 103 +++++++++++++++++----------------------
drivers/block/loop.c | 26 +++++-----
drivers/block/nbd.c | 70 ++++++++++----------------
drivers/mtd/ubi/block.c | 76 ++++++++++++++---------------
drivers/nvme/host/core.c | 41 ++++++++--------
drivers/scsi/sd.c | 8 ++-
drivers/scsi/sr.c | 7 ++-
11 files changed, 246 insertions(+), 181 deletions(-)
--
2.39.2