From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:60176)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1bP9zR-00028s-T1
	for qemu-devel@nongnu.org; Mon, 18 Jul 2016 10:57:50 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1bP9zO-0004ZM-JP
	for qemu-devel@nongnu.org; Mon, 18 Jul 2016 10:57:49 -0400
Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:33991)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1bP9zC-0004YN-Ko
	for qemu-devel@nongnu.org; Mon, 18 Jul 2016 10:57:46 -0400
Received: by mail-wm0-x241.google.com with SMTP id q128so13105566wma.1
	for <qemu-devel@nongnu.org>; Mon, 18 Jul 2016 07:57:34 -0700 (PDT)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
References: <1468605558-3785-1-git-send-email-stefanha@redhat.com>
	<CAFEAcA9V4=DdPdpLgs0exUq_d_TdKF4x+M3wnmcwE0T3T28ERg@mail.gmail.com>
From: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <92d46147-1b9d-c100-e683-a9a5af8f0e78@redhat.com>
Date: Mon, 18 Jul 2016 16:57:31 +0200
MIME-Version: 1.0
In-Reply-To: <CAFEAcA9V4=DdPdpLgs0exUq_d_TdKF4x+M3wnmcwE0T3T28ERg@mail.gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PULL 0/4] Block patches
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: Peter Maydell <peter.maydell@linaro.org>, Stefan Hajnoczi <stefanha@redhat.com>
Cc: QEMU Developers <qemu-devel@nongnu.org>



On 18/07/2016 12:23, Peter Maydell wrote:
> I'm afraid this fails to build for w32:
> 
> /home/petmay01/linaro/qemu-for-merges/block/win32-aio.c:30:21: fatal
> error: raw-aio.h: No such file or directory
>  #include "raw-aio.h"
>                      ^
> compilation terminated.
> 
> Looks like that should be "block/raw-aio.h".

But that's in the patch:

diff --git a/block/raw-win32.c b/block/raw-win32.c
index 62edb1a..9b813d9 100644
--- a/block/raw-win32.c
+++ b/block/raw-win32.c
@@ -27,7 +27,7 @@
 #include "qemu/timer.h"
 #include "block/block_int.h"
 #include "qemu/module.h"
-#include "raw-aio.h"
+#include "block/raw-aio.h"
 #include "trace.h"
 #include "block/thread-pool.h"
 #include "qemu/iov.h"

Did you get a conflict, or did git screw up some resolution?

Paolo