From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:50114)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1Tvr2k-00073V-MK
	for qemu-devel@nongnu.org; Thu, 17 Jan 2013 10:06:17 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1Tvr2f-0001oj-K7
	for qemu-devel@nongnu.org; Thu, 17 Jan 2013 10:06:14 -0500
Received: from mail-la0-f44.google.com ([209.85.215.44]:48493)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1Tvr2f-0001oU-9b
	for qemu-devel@nongnu.org; Thu, 17 Jan 2013 10:06:09 -0500
Received: by mail-la0-f44.google.com with SMTP id eb20so1625970lab.3
	for <qemu-devel@nongnu.org>; Thu, 17 Jan 2013 07:06:08 -0800 (PST)
MIME-Version: 1.0
In-Reply-To: <1358432637-42512-5-git-send-email-cornelia.huck@de.ibm.com>
References: <1358432637-42512-1-git-send-email-cornelia.huck@de.ibm.com>
	<1358432637-42512-5-git-send-email-cornelia.huck@de.ibm.com>
From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 17 Jan 2013 15:05:46 +0000
Message-ID: <CAFEAcA8iZwQTLCf6EC3oud7HMFORS2WmL1amk10MCXmMD+2VGA@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [Qemu-devel] [PATCH 04/12] Update linux headers.
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: linux-s390 <linux-s390@vger.kernel.org>, Anthony Liguori <aliguori@us.ibm.com>, KVM <kvm@vger.kernel.org>, Gleb Natapov <gleb@redhat.com>, Carsten Otte <cotte@de.ibm.com>, Heiko Carstens <heiko.carstens@de.ibm.com>, Marcelo Tosatti <mtosatti@redhat.com>, Sebastian Ott <sebott@linux.vnet.ibm.com>, qemu-devel <qemu-devel@nongnu.org>, Alexander Graf <agraf@suse.de>, Christian Borntraeger <borntraeger@de.ibm.com>, Martin Schwidefsky <schwidefsky@de.ibm.com>

On 17 January 2013 14:23, Cornelia Huck <cornelia.huck@de.ibm.com> wrote:
> Base is kvm-next as of 2013/01/16.

> --- a/linux-headers/asm-powerpc/kvm_para.h
> +++ b/linux-headers/asm-powerpc/kvm_para.h
> @@ -78,7 +78,7 @@ struct kvm_vcpu_arch_shared {
>
>  #define KVM_HCALL_TOKEN(num)     _EV_HCALL_TOKEN(EV_KVM_VENDOR_ID, num)
>
> -#include <asm/epapr_hcalls.h>
> +#include <uapi/asm/epapr_hcalls.h>

This is reintroducing a bug, isn't it? cf
http://lists.gnu.org/archive/html/qemu-devel/2012-12/msg02807.html

(maybe this just means the sync needs to be against some
different set of kernel headers?)

-- PMM