Merge r6405 and r6406 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6504 d57e44dd-8a1f-0410-8b47-8ef2f437770f

nightly/conf/nightly.conf

@@ -3,17 +3,17 @@
 ABT_DETAILS="x86_64"
 ABT_JOBS=5
 ABT_KERNELS="  \
-4.0.6          \
+4.0.7          \
 3.19.7-nc      \
 3.18.8-nc      \
 3.17.8-nc      \
 3.16.7-nc      \
 3.15.10-nc     \
-3.14.45-nc     \
+3.14.46-nc     \
 3.13.11-nc     \
 3.12.38-nc     \
 3.11.10-nc     \
-3.10.81-nc     \
+3.10.82-nc     \
 3.9.11-nc      \
 3.8.13-nc      \
 3.7.10-nc      \

qla2x00t/qla2x00-target/Makefile_in-tree-4.1

@@ -0,0 +1,5 @@
+ccflags-y += -Idrivers/scsi/qla2xxx
+
+qla2x00tgt-y := qla2x00t.o
+
+obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o

scst/kernel/in-tree/Kconfig.drivers.Linux-4.1.patch

@@ -0,0 +1,13 @@
+diff --git a/drivers/Kconfig b/drivers/Kconfig
+index c70d6e4..0a4ed1b 100644
+--- a/drivers/Kconfig
++++ b/drivers/Kconfig
+@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig"
+ 
+ source "drivers/scsi/Kconfig"
+ 
++source "drivers/scst/Kconfig"
++
+ source "drivers/ata/Kconfig"
+ 
+ source "drivers/md/Kconfig"

scst/kernel/in-tree/Makefile.dev_handlers-4.1

@@ -0,0 +1,14 @@
+ccflags-y += -Wno-unused-parameter
+
+obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
+	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
+
+obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
+obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
+obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
+obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
+obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
+obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
+obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
+obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
+obj-$(CONFIG_SCST_USER)		+= scst_user.o

scst/kernel/in-tree/Makefile.drivers.Linux-4.1.patch

@@ -0,0 +1,12 @@
+diff --git a/drivers/Makefile b/drivers/Makefile
+index 527a6da..db2c24f 100644
+--- a/drivers/Makefile
++++ b/drivers/Makefile
+@@ -137,6 +137,7 @@ obj-$(CONFIG_SSB)		+= ssb/
+ obj-$(CONFIG_BCMA)		+= bcma/
+ obj-$(CONFIG_VHOST_RING)	+= vhost/
+ obj-$(CONFIG_VLYNQ)		+= vlynq/
++obj-$(CONFIG_SCST)		+= scst/
+ obj-$(CONFIG_STAGING)		+= staging/
+ obj-y				+= platform/
+ #common clk code

scst/kernel/in-tree/Makefile.scst-4.1

@@ -0,0 +1,13 @@
+ccflags-y += -Wno-unused-parameter
+
+scst-y        += scst_main.o
+scst-y        += scst_pres.o
+scst-y        += scst_targ.o
+scst-y        += scst_lib.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_mem.o
+scst-y        += scst_tg.o
+scst-y        += scst_debug.o
+
+obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
+			srpt/ scst_local/

scst_local/in-tree/Makefile-4.1

@@ -0,0 +1,2 @@
+obj-$(CONFIG_SCST_LOCAL) += scst_local.o
+