Merge branch 'svn-trunk'

iscsi-scst/kernel/iscsi.c

@@ -587,7 +587,6 @@ void req_cmnd_release_force(struct iscsi_cmnd *req)
 		sBUG_ON(req->cmd_req);
 		sBUG_ON(req->main_rsp != NULL);
 		sBUG_ON(!list_empty(&req->rx_ddigest_cmd_list));
-		sBUG_ON(!list_empty(&req->rsp_cmd_list));
 		sBUG_ON(req->pending);
 
 		cmnd_put(req);

scst/README.drbd

@@ -21,6 +21,8 @@ settings for each DRBD block device exported via SCST:
 * Caching MUST be disabled: set the nv_cache parameter to 0 in scst.conf.
 * Write-through MUST be enabled: set the write_through parameter to 1 in
   scst.conf.
+* If SCSI reservations are used, their sync between nodes must be enabled,
+  see README.dlm.
 
 DRBD Configuration
 ------------------