]> www.infradead.org Git - users/hch/block.git/commitdiff
Merge branch 'for-6.2/block' into for-next
authorJens Axboe <axboe@kernel.dk>
Wed, 2 Nov 2022 14:35:40 +0000 (08:35 -0600)
committerJens Axboe <axboe@kernel.dk>
Wed, 2 Nov 2022 14:35:40 +0000 (08:35 -0600)
* for-6.2/block:
  nvme: use blk_mq_[un]quiesce_tagset
  blk-mq: add tagset quiesce interface
  blk-mq: pass a tagset to blk_mq_wait_quiesce_done
  blk-mq: move the srcu_struct used for quiescing to the tagset
  blk-mq: skip non-mq queues in blk_mq_quiesce_queue
  nvme-apple: don't unquiesce the I/O queues in apple_nvme_reset_work
  nvme-pci: don't unquiesce the I/O queues in nvme_remove_dead_ctrl
  nvme: split nvme_kill_queues
  nvme: don't unquiesce the admin queue in nvme_kill_queues
  nvme: remove the NVME_NS_DEAD check in nvme_validate_ns
  nvme: remove the NVME_NS_DEAD check in nvme_remove_invalid_namespaces
  nvme: don't remove namespaces in nvme_passthru_end
  nvme-pci: refactor the tagset handling in nvme_reset_work
  block: set the disk capacity to 0 in blk_mark_disk_dead

1  2 
block/blk-mq.c
block/genhd.c
include/linux/blk-mq.h

diff --cc block/blk-mq.c
Simple merge
diff --cc block/genhd.c
Simple merge
Simple merge