tree 5e3409db199d533c15cc699fbcc2794cc4146b7f
parent c075a7239937e6ae45bcd3793c37b0168bfae93d
parent 5222aaf223e52961cabeb7cabc579892ccd8bc59
author Anthony Liguori <aliguori@us.ibm.com> 1344723083 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1344723083 -0500

Merge remote-tracking branch 'bonzini/scsi-next' into staging

* bonzini/scsi-next:
  scsi-disk: add support for the UNMAP command
  scsi-disk: improve out-of-range LBA detection for WRITE SAME
  scsi-disk: more assertions and resets for aiocb
  virtio-scsi: do not compare 32-bit QEMU tags against 64-bit virtio-scsi tags
  iscsi: Pick default initiator-name based on the name of the VM
  iscsi: reorganize code for parse_initiator_name
  iscsi: do not leak initiator_name