Il 11/12/2013 01:10, Anthony Liguori ha scritto: >> > >> > The following changes since commit >> > ac9524dc55dc32e492ac3e6fbc9785be7168f8a2: >> > >> > qemu-iotests: filter QEMU monitor \r\n (2013-12-06 16:53:51 +0100) >> > >> > are available in the git repository at: >> > >> > git://github.com/bonzini/qemu.git scsi-next > What tree is this against? It looks like the block tree. > > It conflicts badly with current master.
Since master was broken, it was against "some tree that built". I can rebase and resend, but I don't get any conflict against 6747f64 (Merge remote-tracking branch 'rth/tcg-temp-order' into staging, 2013-12-10). And there shouldn't be, since no one else should touch those files. Paolo
