From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=53838 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OOWXz-0001h4-F6
	for qemu-devel@nongnu.org; Tue, 15 Jun 2010 09:51:25 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <avi@redhat.com>) id 1OOWXv-0002HB-98
	for qemu-devel@nongnu.org; Tue, 15 Jun 2010 09:51:20 -0400
Received: from mx1.redhat.com ([209.132.183.28]:63030)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <avi@redhat.com>) id 1OOWXv-0002Gr-02
	for qemu-devel@nongnu.org; Tue, 15 Jun 2010 09:51:19 -0400
Received: from int-mx01.intmail.prod.int.phx2.redhat.com
	(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5FDpIPk029432
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Tue, 15 Jun 2010 09:51:18 -0400
Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com
	[10.35.255.11])
	by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id o5FDpG84011327
	for <qemu-devel@nongnu.org>; Tue, 15 Jun 2010 09:51:17 -0400
Message-ID: <4C178554.9020004@redhat.com>
Date: Tue, 15 Jun 2010 16:51:16 +0300
From: Avi Kivity <avi@redhat.com>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH 1/5] Revert "ide save/restore pio/atapi cmd
	transfer fields and io buffer"
References: <cover.1276607973.git.quintela@redhat.com>
	<f69cf06cf775f17162c9905e46b2458735d10bf3.1276607973.git.quintela@redhat.com>
In-Reply-To: <f69cf06cf775f17162c9905e46b2458735d10bf3.1276607973.git.quintela@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Juan Quintela <quintela@redhat.com>
Cc: qemu-devel@nongnu.org

On 06/15/2010 04:31 PM, Juan Quintela wrote:
> This reverts commit ed487bb1d69040b9dac64a4fc076d8dd82b131d6.
>
> Conflicts:
>
> 	hw/ide/core.c
>    

Changelog should explain why.

-- 
error compiling committee.c: too many arguments to function