From: Anthony Liguori Date: Wed, 14 Nov 2012 14:50:45 +0000 (-0600) Subject: Merge remote-tracking branch 'bonzini/scsi-next' into staging X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5f580e9411a24b7decc07013edeb8abf8d5ae25c;p=people%2Fliuw%2Flibxenctrl-split%2Fqemu-xen.git Merge remote-tracking branch 'bonzini/scsi-next' into staging * bonzini/scsi-next: virtio-scsi: use dma_context_memory dma: Define dma_context_memory and use in sysbus-ohci megasas: Correct target/lun mapping scsi-disk: flush cache after disabling it megasas: do not include block_int.h scsi: remove superfluous call to scsi_device_set_ua virtio-scsi: factor checks for VIRTIO_SCSI_S_DRIVER_OK when reporting events scsi: do not return short responses for emulated commands Signed-off-by: Anthony Liguori --- 5f580e9411a24b7decc07013edeb8abf8d5ae25c