From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42117) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqeTJ-0004He-VS for qemu-devel@nongnu.org; Wed, 11 Dec 2013 02:44:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VqeTC-00033i-S7 for qemu-devel@nongnu.org; Wed, 11 Dec 2013 02:44:41 -0500 Received: from mail-ea0-x232.google.com ([2a00:1450:4013:c01::232]:48790) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqeTC-00033b-L4 for qemu-devel@nongnu.org; Wed, 11 Dec 2013 02:44:34 -0500 Received: by mail-ea0-f178.google.com with SMTP id d10so2761870eaj.9 for ; Tue, 10 Dec 2013 23:44:33 -0800 (PST) Sender: Paolo Bonzini Message-ID: <52A817DD.1010302@redhat.com> Date: Wed, 11 Dec 2013 08:44:29 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1386594157-17535-1-git-send-email-pbonzini@redhat.com> <877gbcjlgs.fsf@codemonkey.ws> In-Reply-To: <877gbcjlgs.fsf@codemonkey.ws> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PULL 0/5] SCSI patches for 2013-12-09 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org 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