Merge branch 'svn-trunk'

This commit is contained in:
Bart Van Assche
2017-05-01 22:30:46 -07:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -5359,7 +5359,7 @@ static void q24_atio_pkt(scsi_qla_host_t *vha, atio7_entry_t *atio)
switch (atio->entry_type) {
case ATIO_TYPE7:
TRACE_DBG("ATIO_TYPE7 instance %ld, lun %Lx, read/write %d/%d, "
TRACE_DBG("ATIO_TYPE7 instance %ld, lun %llx, read/write %d/%d, "
"add_cdb_len %d, data_length %04x, s_id %x:%x:%x",
vha->host_no, atio->fcp_cmnd.lun, atio->fcp_cmnd.rddata,
atio->fcp_cmnd.wrdata, atio->fcp_cmnd.add_cdb_len,
+1 -1
View File
@@ -7757,7 +7757,7 @@ static bool scst_sysfs_user_info_executing(struct scst_sysfs_user_info *info)
}
/**
* scst_wait_info_completion() - wait an user space event's completion
* scst_wait_info_completion() - wait for a user space event's completion
*
* Waits for the info request been completed by user space at most timeout
* jiffies. If the reply received before timeout and being processed by