From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 5 Mar 2021 16:13:07 +0000 (-0700)
Subject: Merge tag 'nvme-5.12-2021-03-05' of git://git.infradead.org/nvme into block-5.12
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a2b658e4a07d05fcf056e2b9524ed8cc214f486a;p=linux.git

Merge tag 'nvme-5.12-2021-03-05' of git://git.infradead.org/nvme into block-5.12

Pull NVMe fixes from Christoph:

"nvme fixes for 5.12:

 - more device quirks (Julian Einwag, Zoltán Böszörményi, Pascal Terjan)
 - fix a hwmon error return (Daniel Wagner)
 - fix the keep alive timeout initialization (Martin George)
 - ensure the model_number can't be changed on a used subsystem
   (Max Gurtovoy)"

* tag 'nvme-5.12-2021-03-05' of git://git.infradead.org/nvme:
  nvmet: model_number must be immutable once set
  nvme-fabrics: fix kato initialization
  nvme-hwmon: Return error code when registration fails
  nvme-pci: add quirks for Lexar 256GB SSD
  nvme-pci: mark Kingston SKC2000 as not supporting the deepest power state
  nvme-pci: mark Seagate Nytro XM1440 as QUIRK_NO_NS_DESC_LIST.
---

a2b658e4a07d05fcf056e2b9524ed8cc214f486a