All of lore.kernel.org
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: Anthony Liguori <anthony@codemonkey.ws>
Cc: qemu-devel@nongnu.org
Subject: [Qemu-devel] Re: [PATCH 1/6] Revert "ide save/restore pio/atapi cmd transfer fields and io buffer"
Date: Fri, 20 Aug 2010 01:10:57 +0200	[thread overview]
Message-ID: <m38w425hby.fsf@trasno.org> (raw)
In-Reply-To: <4C6D3472.9010708@codemonkey.ws> (Anthony Liguori's message of "Thu, 19 Aug 2010 08:41:06 -0500")

Anthony Liguori <anthony@codemonkey.ws> wrote:
> On 07/26/2010 02:38 PM, Juan Quintela wrote:
>> This reverts commit ed487bb1d69040b9dac64a4fc076d8dd82b131d6.
>>
>> The conflicts are due to commit 4fc8d6711aff7a9c11e402c3d77b481609f9f486
>> that is a fix to the ide_drive_pre_save() function.  It reverts both
>> (and both are reinstantiated later in the series)
>>
>> Conflicts:
>>
>> 	hw/ide/core.c
>>
>> Signed-off-by: Juan Quintela<quintela@redhat.com>
>>    
>
> These don't apply cleanly and fail in a non-obvious way.  Can you rebase?
>
> Regards,

I guess you mean against stable here (otherwise, they have already been
integrated).

I am on holidays until Monday,  if it is against stable, I will do it there.

Later, Juan.

  reply	other threads:[~2010-08-19 23:13 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-26 19:38 [Qemu-devel] [PATCH 0/6] [PATCH v2 0/6] Migration subsections (and ide as example) Juan Quintela
2010-07-26 19:38 ` [Qemu-devel] [PATCH 1/6] Revert "ide save/restore pio/atapi cmd transfer fields and io buffer" Juan Quintela
2010-08-19 13:41   ` [Qemu-devel] " Anthony Liguori
2010-08-19 23:10     ` Juan Quintela [this message]
2010-07-26 19:38 ` [Qemu-devel] [PATCH 2/6] Revert "ide save/restore current transfer fields" Juan Quintela
2010-07-26 19:38 ` [Qemu-devel] [PATCH 3/6] vmstate: add subsections code Juan Quintela
2010-07-26 19:38 ` [Qemu-devel] [PATCH 4/6] ide: fix migration in the middle of pio operation Juan Quintela
2010-07-26 19:38 ` [Qemu-devel] [PATCH 5/6] ide: fix migration in the middle of a bmdma transfer Juan Quintela
2010-07-26 19:38 ` [Qemu-devel] [PATCH 6/6] Initial documentation for migration Juan Quintela

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=m38w425hby.fsf@trasno.org \
    --to=quintela@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.