OSDN Git Service

Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 4 Mar 2014 14:25:34 +0000 (14:25 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 4 Mar 2014 14:25:34 +0000 (14:25 +0000)
* remotes/bonzini/scsi-next:
  block/iscsi: fix segfault if writesame fails
  scsi-disk: Add support for port WWN and index descriptors in VPD page 83h
  block/iscsi: query for supported VPD pages
  block/iscsi: fix deadlock on scsi check condition
  scsi-bus: Fix transfer length for VERIFY with BYTCHK=11b
  scsi: report thin provisioning errors with werror=report
  scsi: Change scsi sense buf size to 252

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge