Merge remote-tracking branch 'scsi-queue/drivers-for-3.17' into for-next

2014-08-06 10:26:55 -07:00
parent 653f0c8bad bfb5087924
commit ae87e8b212
11 changed files with 126 additions and 115 deletions
@@ -527,6 +527,7 @@ enum iscsi_err {
 	ISCSI_ERR_XMIT_FAILED		= ISCSI_ERR_BASE + 19,
 	ISCSI_ERR_TCP_CONN_CLOSE	= ISCSI_ERR_BASE + 20,
 	ISCSI_ERR_SCSI_EH_SESSION_RST	= ISCSI_ERR_BASE + 21,
+	ISCSI_ERR_NOP_TIMEDOUT		= ISCSI_ERR_BASE + 22,
 };

 /*