Am 16.07.2013 um 13:55 schrieb Paolo Bonzini <pbonz...@redhat.com>: > Il 16/07/2013 13:40, Peter Lieven ha scritto: >> >> The conflict with your block status patches can't be large. >> upstream/master has no >> iscsi_co_is_allocated yet, so there should be no trouble. > > Yes, whoever goes second has to change it to the new get_block_status > API. Kevin and Stefan can decide who that lucky guy is.
Wouldn't you be able to merge it into scsi/next ? Peter