New upstream version 6.6

[mirror_smartmontools-debian.git] / scsicmds.h

diff --git a/scsicmds.h b/scsicmds.h
index 3451fec78f1d8768d5bc13480f53f29788b9e860..bbb9f8af19aadfc0e937a140c1c44ed361ff3c45 100644 (file)
--- a/scsicmds.h
+++ b/scsicmds.h
@@ -5,11 +5,6 @@
  *
  * Copyright (C) 2002-8 Bruce Allen
  * Copyright (C) 2000 Michael Cornwell <cornwell@acm.org>
-<<<<<<< HEAD
-=======
- *
- * Additional SCSI work:
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
  * Copyright (C) 2003-15 Douglas Gilbert <dgilbert@interlog.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -35,11 +30,7 @@
 #ifndef SCSICMDS_H_
 #define SCSICMDS_H_
 
-<<<<<<< HEAD
-#define SCSICMDS_H_CVSID "$Id: scsicmds.h 4152 2015-10-17 16:08:21Z chrfranke $\n"
-=======
-#define SCSICMDS_H_CVSID "$Id: scsicmds.h 4081 2015-05-10 16:42:50Z chrfranke $\n"
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
+#define SCSICMDS_H_CVSID "$Id: scsicmds.h 4557 2017-10-19 19:17:29Z samm2 $\n"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -313,8 +304,9 @@ Documentation, see http://www.storage.ibm.com/techsup/hddtech/prodspecs.htm */
 
 
 /* SCSI command timeout values (units are seconds) */
-#define SCSI_TIMEOUT_DEFAULT    20  // should be longer than the spin up time
-                                    // of a disk in standby mode.
+#define SCSI_TIMEOUT_DEFAULT    60  // should be longer than the spin up time
+                                    // of a disk in JBOD.
+
 #define SCSI_TIMEOUT_SELF_TEST  (5 * 60 * 60)   /* allow max 5 hours for */
                                             /* extended foreground self test */