git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	James Bottomley <James.Bottomley@HansenPartnership.com>
	Tue, 27 Mar 2018 16:27:34 +0000 (12:27 -0400)
committer	James Bottomley <James.Bottomley@HansenPartnership.com>
	Wed, 4 Apr 2018 00:38:39 +0000 (17:38 -0700)
commit	99d2f99f915418309d673ebc532fb06c5e94e49e
tree	9ab4f369e72a6f1953f53269030bbba047c6be8a	tree \| snapshot
parent	6945ee55749fd23692d81b0e716a033aaf33bc97	commit \| diff
parent	3dc9ea5806f34d21aeda6eca1463aaec50b8ff45	commit \| diff

Merge branch 'fixes' into misc

Somewhat nasty merge due to conflicts between "ee59f0cc3ae4 scsi:
qla2xxx: Fix Async GPN_FT for FCP and FC-NVMe scan" and "85d8e565e96e
scsi: qla2xxx: Fix FC-NVMe LUN discovery"

Merge is non-trivial and has been verified by Qlogic (Cavium)

Signed-off-by: James E.J. Bottomley <jejb@linux.vnet.ibm.com>

31 files changed:

drivers/scsi/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/scsi/aacraid/linit.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/csiostor/csio_lnode.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/device_handler/scsi_dh_alua.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/hosts.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/hpsa.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/libsas/sas_scsi_host.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/megaraid/megaraid_sas_base.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/mpt3sas/mpt3sas_base.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/mpt3sas/mpt3sas_base.h	diff1 \|	diff2 \|	blob \| history
drivers/scsi/mpt3sas/mpt3sas_scsih.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qedi/qedi_fw.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qedi/qedi_main.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/qla_dbg.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/qla_def.h	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/qla_gs.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/qla_init.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/qla_iocb.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/qla_isr.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/qla_mbx.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/qla_os.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/qla_target.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla4xxx/ql4_os.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_error.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_lib.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sd.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sd_zbc.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/storvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ufs/ufshcd.c	diff1 \|	diff2 \|	blob \| history
include/scsi/scsi_cmnd.h	diff1 \|	diff2 \|	blob \| history
include/scsi/scsi_host.h	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

drivers/scsi/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/scsi/aacraid/linit.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/csiostor/csio_lnode.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/device_handler/scsi_dh_alua.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/hosts.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/hpsa.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/libsas/sas_scsi_host.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/megaraid/megaraid_sas_base.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/mpt3sas/mpt3sas_base.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/mpt3sas/mpt3sas_base.h	diff1 \|	diff2 \|	blob \| history
drivers/scsi/mpt3sas/mpt3sas_scsih.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qedi/qedi_fw.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qedi/qedi_main.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/qla_dbg.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/qla_def.h	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/qla_gs.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/qla_init.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/qla_iocb.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/qla_isr.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/qla_mbx.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/qla_os.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/qla_target.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla4xxx/ql4_os.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_error.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_lib.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sd.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sd_zbc.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/storvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ufs/ufshcd.c	diff1 \|	diff2 \|	blob \| history
include/scsi/scsi_cmnd.h	diff1 \|	diff2 \|	blob \| history
include/scsi/scsi_host.h	diff1 \|	diff2 \|	blob \| history