Merge "block: Make del_gendisk() safer for disks without queues"