From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 22 Apr 2021 16:23:55 +0000 (-0600)
Subject: Merge tag 'nvme-5.13-2021-04-22' of git://git.infradead.org/nvme into for-5.13/drivers
X-Git-Tag: v5.13-rc1~116^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87d9ad028975e8f47a980fffa9196b426f69f258;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'nvme-5.13-2021-04-22' of git://git.infradead.org/nvme into for-5.13/drivers

Pull NVMe updates from Christoph:

"- add support for a per-namespace character device (Minwoo Im)
 - various KATO fixes and cleanups (Hou Pu, Hannes Reinecke)
 - APST fix and cleanup"

* tag 'nvme-5.13-2021-04-22' of git://git.infradead.org/nvme:
  nvme: introduce generic per-namespace chardev
  nvme: cleanup nvme_configure_apst
  nvme: do not try to reconfigure APST when the controller is not live
  nvme: add 'kato' sysfs attribute
  nvme: sanitize KATO setting
  nvmet: avoid queuing keep-alive timer if it is disabled
---

87d9ad028975e8f47a980fffa9196b426f69f258