Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe: "A set of fixes that missed the merge window, mostly due to me being away around that time. Nothing major here, a mix of nvme cleanups and fixes, and one fix for the badblocks handling" * 'for-linus' of git://git.kernel.dk/linux-block: nvmet: use symbolic constants for CNS values nvme: use symbolic constants for CNS values nvme.h: add an enum for cns values nvme.h: don't use uuid_be nvme.h: resync with nvme-cli nvme: Add tertiary number to NVME_VS nvme : Add sysfs entry for NVMe CMBs when appropriate nvme: don't schedule multiple resets nvme: Delete created IO queues on reset nvme: Stop probing a removed device badblocks: fix overlapping check for clearing
Showing
- block/badblocks.c 4 additions, 2 deletionsblock/badblocks.c
- drivers/nvme/host/core.c 8 additions, 6 deletionsdrivers/nvme/host/core.c
- drivers/nvme/host/pci.c 54 additions, 23 deletionsdrivers/nvme/host/pci.c
- drivers/nvme/host/scsi.c 2 additions, 2 deletionsdrivers/nvme/host/scsi.c
- drivers/nvme/target/admin-cmd.c 4 additions, 4 deletionsdrivers/nvme/target/admin-cmd.c
- drivers/nvme/target/core.c 1 addition, 1 deletiondrivers/nvme/target/core.c
- drivers/nvme/target/discovery.c 2 additions, 2 deletionsdrivers/nvme/target/discovery.c
- include/linux/nvme.h 40 additions, 9 deletionsinclude/linux/nvme.h
Please register or sign in to comment