From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48059)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1WkAeK-0007XQ-Cu
	for qemu-devel@nongnu.org; Tue, 13 May 2014 07:13:38 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1WkAeC-0007LA-I2
	for qemu-devel@nongnu.org; Tue, 13 May 2014 07:13:32 -0400
Received: from mx1.redhat.com ([209.132.183.28]:17253)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1WkAeC-0007Kr-Aw
	for qemu-devel@nongnu.org; Tue, 13 May 2014 07:13:24 -0400
Message-ID: <5371FE4C.30205@redhat.com>
Date: Tue, 13 May 2014 13:13:16 +0200
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1399704652-6827-1-git-send-email-pbonzini@redhat.com>
	<20140513123133.30141d7c.cornelia.huck@de.ibm.com>
In-Reply-To: <20140513123133.30141d7c.cornelia.huck@de.ibm.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PULL 0/8] KVM changes for 2014-05-08
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/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: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: Alexey Kardashevskiy <aik@ozlabs.ru>, Christian Borntraeger <borntraeger@de.ibm.com>, qemu-devel@nongnu.org, Alexander Graf <agraf@suse.de>

Il 13/05/2014 12:31, Cornelia Huck ha scritto:
> On Sat, 10 May 2014 08:50:44 +0200
> Paolo Bonzini <pbonzini@redhat.com> wrote:
>
>> The following changes since commit 3a87f8b6859e6221b827ab4737779dddb37=
553ec:
>>
>>   Merge remote-tracking branch 'remotes/afaerber/tags/ppc-for-2.0' int=
o staging (2014-03-20 11:45:38 +0000)
>>
>> are available in the git repository at:
>>
>>
>>   git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git uq/master
>
> I rebased to qemu/master, where compilation fails with
>
> /home/cohuck/git/qemu/target-s390x/kvm.c:132: error: static declaration=
 of =E2=80=98kvm_set_one_reg=E2=80=99 follows non-static declaration
> /home/cohuck/git/qemu/include/sysemu/kvm.h:383: error: previous declara=
tion of =E2=80=98kvm_set_one_reg=E2=80=99 was here
> /home/cohuck/git/qemu/target-s390x/kvm.c:146: error: static declaration=
 of =E2=80=98kvm_get_one_reg=E2=80=99 follows non-static declaration
> /home/cohuck/git/qemu/include/sysemu/kvm.h:393: error: previous declara=
tion of =E2=80=98kvm_get_one_reg=E2=80=99 was here

I'll resend the pull request, thanks.

Paolo