Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe: "A set of fixes that should go into this series. This contains: - Fix from Bart for blk-mq requeue queue running, preventing a continued loop of run/restart. - Fix for a bio/blk-integrity issue, in two parts. One from Christoph, fixing where verification happens, and one from Milan, for a NULL profile. - NVMe pull request, most of the changes being for nvme-fc, but also a few trivial core/pci fixes" * 'for-linus' of git://git.kernel.dk/linux-block: nvme: fix directive command numd calculation nvme: fix nvme reset command timeout handling nvme-pci: fix CMB sysfs file removal in reset path lpfc: support nvmet_fc defer_rcv callback nvmet_fc: add defer_req callback for deferment of cmd buffer return nvme: strip trailing 0-bytes in wwid_show block: Make blk_mq_delay_kick_requeue_list() rerun the queue at a quiet time bio-integrity: only verify integrity on the lowest stacked driver bio-integrity: Fix regression if profile verify_fn is NULL
Showing
- block/bio-integrity.c 4 additions, 2 deletionsblock/bio-integrity.c
- block/blk-mq.c 2 additions, 2 deletionsblock/blk-mq.c
- drivers/nvme/host/core.c 25 additions, 10 deletionsdrivers/nvme/host/core.c
- drivers/nvme/host/pci.c 7 additions, 11 deletionsdrivers/nvme/host/pci.c
- drivers/nvme/target/fc.c 184 additions, 28 deletionsdrivers/nvme/target/fc.c
- drivers/scsi/lpfc/lpfc_attr.c 3 additions, 1 deletiondrivers/scsi/lpfc/lpfc_attr.c
- drivers/scsi/lpfc/lpfc_debugfs.c 4 additions, 1 deletiondrivers/scsi/lpfc/lpfc_debugfs.c
- drivers/scsi/lpfc/lpfc_nvmet.c 30 additions, 0 deletionsdrivers/scsi/lpfc/lpfc_nvmet.c
- drivers/scsi/lpfc/lpfc_nvmet.h 1 addition, 0 deletionsdrivers/scsi/lpfc/lpfc_nvmet.h
- include/linux/nvme-fc-driver.h 7 additions, 0 deletionsinclude/linux/nvme-fc-driver.h
Please register or sign in to comment