commit | 6d06368d6bebad74fd16ef76a6bbea0c1cb63c9a | [log] [tgz] |
---|---|---|
author | Anthony Liguori <aliguori@us.ibm.com> | Sun Mar 10 19:30:45 2013 -0500 |
committer | Anthony Liguori <aliguori@us.ibm.com> | Sun Mar 10 19:30:45 2013 -0500 |
tree | bbc9dfa80b663da38fe05baad2d2f18742bab6e2 | |
parent | 44ab9ed4f859fc6f691ba433c24d354ba93f056f [diff] | |
parent | 0c92e0e6b64c9061f7365a2712b9055ea35b52f9 [diff] |
Merge remote-tracking branch 'bonzini/scsi-next' into staging # By Paolo Bonzini (4) and Peter Lieven (2) # Via Paolo Bonzini * bonzini/scsi-next: scsi-disk: handle io_canceled uniformly and correctly scsi-disk: do not complete canceled UNMAP requests scsi: do not call scsi_read_data/scsi_write_data for a canceled request iscsi: look for pkg-config file too iscsi: add iscsi_truncate support iscsi: retry read, write, flush and unmap on unit attention check conditions