[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [PATCH 1/6] Revert "ide save/restore pio/atapi cmd tran
From: |
Juan Quintela |
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 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) |
Anthony Liguori <address@hidden> 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<address@hidden>
>>
>
> 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.