snic: driver for Cisco SCSI HBA

Cisco has developed a new PCI HBA interface called sNIC, which stands for
SCSI NIC. This is a new storage feature supported on specialized network
adapter. The new PCI function provides a uniform host interface and abstracts
backend storage.

[jejb: fix up checkpatch errors]
Signed-off-by: Narsimhulu Musini <nmusini@cisco.com>
Signed-off-by: Sesidhar Baddela <sebaddel@cisco.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 182764a..4336263 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2590,6 +2590,13 @@ L:       linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/fnic/
 
+CISCO SCSI HBA DRIVER
+M:     Narsimhulu Musini <nmusini@cisco.com>
+M:     Sesidhar Baddela <sebaddel@cisco.com>
+L:     linux-scsi@vger.kernel.org
+S:     Supported
+F:     drivers/scsi/snic/
+
 CMPC ACPI DRIVER
 M:     Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
 M:     Daniel Oliveira Nascimento <don@syst.com.br>

diff --cc drivers/scsi/Kconfig
Simple merge

diff --cc drivers/scsi/Makefile
Simple merge

diff --cc drivers/scsi/snic/Makefile
Simple merge

diff --cc drivers/scsi/snic/cq_desc.h
Simple merge

diff --cc drivers/scsi/snic/cq_enet_desc.h
Simple merge

diff --cc drivers/scsi/snic/snic.h
Simple merge

diff --cc drivers/scsi/snic/snic_attrs.c
Simple merge

diff --cc drivers/scsi/snic/snic_ctl.c
Simple merge

diff --cc drivers/scsi/snic/snic_debugfs.c
Simple merge

diff --cc drivers/scsi/snic/snic_disc.c
Simple merge

diff --cc drivers/scsi/snic/snic_disc.h
Simple merge

diff --cc drivers/scsi/snic/snic_fwint.h
Simple merge

diff --cc drivers/scsi/snic/snic_io.c
Simple merge

diff --cc drivers/scsi/snic/snic_io.h
Simple merge

diff --cc drivers/scsi/snic/snic_isr.c
Simple merge

diff --cc drivers/scsi/snic/snic_main.c
Simple merge

diff --cc drivers/scsi/snic/snic_res.c
Simple merge

diff --cc drivers/scsi/snic/snic_res.h
Simple merge

diff --cc drivers/scsi/snic/snic_scsi.c
Simple merge

diff --cc drivers/scsi/snic/snic_stats.h
Simple merge

diff --cc drivers/scsi/snic/snic_trc.c
Simple merge

diff --cc drivers/scsi/snic/snic_trc.h
Simple merge

diff --cc drivers/scsi/snic/vnic_cq.c
Simple merge

diff --cc drivers/scsi/snic/vnic_cq.h
Simple merge

diff --cc drivers/scsi/snic/vnic_cq_fw.h
Simple merge

diff --cc drivers/scsi/snic/vnic_dev.c
Simple merge

diff --cc drivers/scsi/snic/vnic_dev.h
Simple merge

diff --cc drivers/scsi/snic/vnic_devcmd.h
Simple merge

diff --cc drivers/scsi/snic/vnic_intr.c
Simple merge

diff --cc drivers/scsi/snic/vnic_intr.h
Simple merge

diff --cc drivers/scsi/snic/vnic_resource.h
Simple merge

diff --cc drivers/scsi/snic/vnic_snic.h
Simple merge

diff --cc drivers/scsi/snic/vnic_stats.h
Simple merge

diff --cc drivers/scsi/snic/vnic_wq.c
Simple merge

diff --cc drivers/scsi/snic/vnic_wq.h
Simple merge

diff --cc drivers/scsi/snic/wq_enet_desc.h
Simple merge