Merge remote-tracking branch 'bonzini/scsi-next' into staging
authorAnthony Liguori <aliguori@amazon.com>
Thu, 10 Oct 2013 17:03:00 +0000 (10:03 -0700)
committerAnthony Liguori <aliguori@amazon.com>
Thu, 10 Oct 2013 17:03:00 +0000 (10:03 -0700)
# By Asias He (1) and Peter Lieven (1)
# Via Paolo Bonzini
* bonzini/scsi-next:
  scsi: Allocate SCSITargetReq r->buf dynamically [CVE-2013-4344]
  block/iscsi: reenable iscsi_co_get_block_status

Message-id: 1381332391-8781-1-git-send-email-pbonzini@redhat.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>

Trivial merge