Mostly small bug fixes and small updates. The only things of note is a qla2xxx fix for crash on hotplug and timeout and the addition of a user exposed abstraction layer for persistent reservation error return handling (which necessitates the conversion of nvme.c as well as SCSI). The patch is available here: git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-misc The short changelog is: Arun Easi (1): scsi: qla2xxx: Fix crash when I/O abort times out Christophe JAILLET (1): scsi: libfc: Include the correct header Johannes Thumshirn (1): scsi: sd: sd_zbc: Trace zone append emulation Mike Christie (4): nvme: Convert NVMe errors to PR errors scsi: sd: Convert SCSI errors to PR errors scsi: core: Rename status_byte to sg_status_byte block: Add error codes for common PR failures And the diffstat: drivers/nvme/host/core.c | 33 +++++++++++++++- drivers/scsi/libfc/fc_disc.c | 2 +- drivers/scsi/qla2xxx/qla_init.c | 14 +++++-- drivers/scsi/scsi_ioctl.c | 2 +- drivers/scsi/sd.c | 35 ++++++++++++++++- drivers/scsi/sd_trace.h | 84 +++++++++++++++++++++++++++++++++++++++++ drivers/scsi/sd_zbc.c | 6 +++ drivers/scsi/sg.c | 2 +- include/scsi/scsi.h | 1 + include/scsi/sg.h | 2 +- include/uapi/linux/pr.h | 17 +++++++++ 11 files changed, 187 insertions(+), 11 deletions(-) create mode 100644 drivers/scsi/sd_trace.h James