From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=43468 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OmEIQ-0002MO-Sg for qemu-devel@nongnu.org; Thu, 19 Aug 2010 19:13:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OmEIP-0002Rr-Ix for qemu-devel@nongnu.org; Thu, 19 Aug 2010 19:13:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61993) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OmEIP-0002R6-Cl for qemu-devel@nongnu.org; Thu, 19 Aug 2010 19:13:17 -0400 From: Juan Quintela In-Reply-To: <4C6D3472.9010708@codemonkey.ws> (Anthony Liguori's message of "Thu, 19 Aug 2010 08:41:06 -0500") References: <4C6D3472.9010708@codemonkey.ws> Date: Fri, 20 Aug 2010 01:10:57 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: [Qemu-devel] Re: [PATCH 1/6] Revert "ide save/restore pio/atapi cmd transfer fields and io buffer" List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org Anthony Liguori 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 >> > > 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.