From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 11 Mar 2013 00:30:45 +0000 (-0500)
Subject: Merge remote-tracking branch 'bonzini/scsi-next' into staging
X-Git-Tag: v1.5.0-rc0~489
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d06368d6bebad74fd16ef76a6bbea0c1cb63c9a;p=thirdparty%2Fqemu.git

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
---

6d06368d6bebad74fd16ef76a6bbea0c1cb63c9a