All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: Anthony Liguori <anthony@codemonkey.ws>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PULL 0/5] SCSI patches for 2013-12-09
Date: Wed, 11 Dec 2013 08:44:29 +0100	[thread overview]
Message-ID: <52A817DD.1010302@redhat.com> (raw)
In-Reply-To: <877gbcjlgs.fsf@codemonkey.ws>

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

      reply	other threads:[~2013-12-11  7:44 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-09 13:02 [Qemu-devel] [PULL 0/5] SCSI patches for 2013-12-09 Paolo Bonzini
2013-12-09 13:02 ` [Qemu-devel] [PULL 1/5] scsi-bus: fix transfer length and direction for VERIFY command Paolo Bonzini
2013-12-09 13:02 ` [Qemu-devel] [PULL 2/5] scsi-disk: fix VERIFY emulation Paolo Bonzini
2013-12-09 13:02 ` [Qemu-devel] [PULL 3/5] block/iscsi: introduce bdrv_co_{readv, writev, flush_to_disk} Paolo Bonzini
2013-12-09 13:02 ` [Qemu-devel] [PULL 4/5] scsi-disk: fix WRITE SAME with large non-zero payload Paolo Bonzini
2013-12-09 13:02 ` [Qemu-devel] [PULL 5/5] help: add id suboption to -iscsi Paolo Bonzini
2013-12-11  0:10 ` [Qemu-devel] [PULL 0/5] SCSI patches for 2013-12-09 Anthony Liguori
2013-12-11  7:44   ` Paolo Bonzini [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=52A817DD.1010302@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=anthony@codemonkey.ws \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.