tree 4cd7e0f966b3ad13dc819070ee6351eae489fb58
parent d47e95c0c86ea5d8d050bf201ee27bcec617c10e
parent d9738fd2463f71530d8d92fbb52ebdd1d78074fc
author Peter Maydell <peter.maydell@linaro.org> 1393943134 +0000
committer Peter Maydell <peter.maydell@linaro.org> 1393943134 +0000

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

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