Merge branch 'svn-trunk'

scst/kernel/in-tree/Makefile.dev_handlers

@@ -1,8 +1,5 @@
 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

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

@@ -1,8 +1,5 @@
 EXTRA_CFLAGS += -Iinclude/scst -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

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

@@ -1,8 +1,5 @@
 ccflags-y += -Iinclude/scst -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

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

@@ -1,8 +1,5 @@
 ccflags-y += -Iinclude/scst -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

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

@@ -1,8 +1,5 @@
 ccflags-y += -Iinclude/scst -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

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

@@ -1,8 +1,5 @@
 ccflags-y += -Iinclude/scst -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

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

@@ -1,8 +1,5 @@
 ccflags-y += -Iinclude/scst -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

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

@@ -1,8 +1,5 @@
 ccflags-y += -Iinclude/scst -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

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

@@ -1,8 +1,5 @@
 ccflags-y += -Iinclude/scst -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

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

@@ -1,8 +1,5 @@
 ccflags-y += -Iinclude/scst -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

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

@@ -1,8 +1,5 @@
 ccflags-y += -Iinclude/scst -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

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

@@ -1,8 +1,5 @@
 ccflags-y += -Iinclude/scst -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

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

@@ -1,8 +1,5 @@
 ccflags-y += -Iinclude/scst -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

scst/src/dev_handlers/Makefile

@@ -35,16 +35,6 @@ SCST_INC_DIR := $(SUBDIRS)/../include
 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
-
 else
 ######### BEGIN OUT-OF-TREE RULES #########
 

scst/src/dev_handlers/scst_vdisk.c

@@ -4141,12 +4141,14 @@ static int vdisk_usn_vpd(uint8_t *buf, struct scst_cmd *cmd,
 		read_lock(&vdisk_serial_rwlock);
 		usn_len = strlen(virt_dev->usn);
 		buf[3] = usn_len;
-#pragma GCC diagnostic push
 #if __GNUC__ -0 >= 8
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wstringop-truncation"
 #endif
 		strncpy(&buf[4], virt_dev->usn, usn_len);
+#if __GNUC__ -0 >= 8
 #pragma GCC diagnostic pop
+#endif
 		read_unlock(&vdisk_serial_rwlock);
 	}
 	return buf[3] + 4;