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.
No related branches found
No related tags found
Showing
- drivers/nvme/host/fabrics.c 4 additions, 1 deletiondrivers/nvme/host/fabrics.c
- drivers/nvme/host/hwmon.c 1 addition, 0 deletionsdrivers/nvme/host/hwmon.c
- drivers/nvme/host/pci.c 7 additions, 1 deletiondrivers/nvme/host/pci.c
- drivers/nvme/target/admin-cmd.c 25 additions, 11 deletionsdrivers/nvme/target/admin-cmd.c
- drivers/nvme/target/configfs.c 23 additions, 27 deletionsdrivers/nvme/target/configfs.c
- drivers/nvme/target/core.c 1 addition, 1 deletiondrivers/nvme/target/core.c
- drivers/nvme/target/nvmet.h 1 addition, 6 deletionsdrivers/nvme/target/nvmet.h
Loading
Please register or sign in to comment