tree 59c7a9dbf8cb6ad5b590b07e01beac518e6d20d0
parent 7d8f4b34a4bb6996d958da211f1dfb2686c7d82b
parent 1288844e7c4ede59509bf697a4cca0f2215a1ce3
author Anthony Liguori <aliguori@us.ibm.com> 1371568007 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1371568007 -0500

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

# By Paolo Bonzini (3) and others
# Via Paolo Bonzini
* bonzini/scsi-next:
  iscsi: reorganize iscsi_readcapacity_sync
  iscsi: simplify freeing of tasks
  vhost-scsi: fix k->set_guest_notifiers() NULL dereference
  scsi-disk: scsi-block device for scsi pass-through should not be removable
  scsi-generic: check the return value of bdrv_aio_ioctl in execute_command
  scsi-generic: fix sign extension of READ CAPACITY(10) data
  scsi: reset cdrom tray statuses on scsi_disk_reset

Message-id: 1371565016-2643-1-git-send-email-pbonzini@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>