Merge tag 'nvme-5.15-2021-10-14' of git://git.infradead.org/nvme into block-5.15
authorJens Axboe <axboe@kernel.dk>
Thu, 14 Oct 2021 15:07:14 +0000 (09:07 -0600)
committerJens Axboe <axboe@kernel.dk>
Thu, 14 Oct 2021 15:07:14 +0000 (09:07 -0600)
commitbaa0ab2ba22395d85854e8d818beb1763b48f7dc
tree37150ea0d53e1de6accc790fa3c7177d29116653
parent7904022decc260a19dd65b56ac896387f5da6f8c
parentbe5eb933542629ad6a7d4c92097b1b472b1612d0
Merge tag 'nvme-5.15-2021-10-14' of git://git.infradead.org/nvme into block-5.15

Pull NVMe fixes from Christoph:

"nvme fixes for Linux 5.15:

 - fix the abort command id (Keith Busch)
 - nvme: fix per-namespace chardev deletion (Adam Manzanares)"

* tag 'nvme-5.15-2021-10-14' of git://git.infradead.org/nvme:
  nvme: fix per-namespace chardev deletion
  nvme-pci: Fix abort command id
drivers/nvme/host/core.c
drivers/nvme/host/pci.c