merge by hand (scsi_device.h)

diff --cc drivers/s390/scsi/zfcp_aux.c
Simple merge

diff --cc drivers/scsi/scsi_lib.c
Simple merge

diff --cc drivers/scsi/sg.c
Simple merge

diff --cc include/scsi/scsi_device.h
index fe9571d2e306434df698b5d997b8204e0755bc56,7099d2ce967e673c43b64ca6404fc1015be93dcb..c018020d9160891b511e03bdff1db93796bf9928
--- 1/include/scsi/scsi_device.h
--- 2/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@@ -43,8 -43,9 +43,9 @@@ struct scsi_device 
        struct list_head    siblings;   /* list of all devices on this host */
        struct list_head    same_target_siblings; /* just the devices sharing same target id */
  
-       volatile unsigned short device_busy;    /* commands actually active on low-level */
 +      /* this is now protected by the request_queue->queue_lock */
 -      spinlock_t sdev_lock;           /* also the request queue_lock */
+       unsigned int device_busy;       /* commands actually active on
+                                        * low-level. protected by queue_lock. */
        spinlock_t list_lock;
        struct list_head cmd_list;      /* queue of in use SCSI Command structures */
        struct list_head starved_entry;