From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ehrhardt Christian Subject: [PATCH] [PATCH] kvm-userspace: fix io.h include merge confilict Date: Mon, 10 Nov 2008 10:34:52 +0100 Message-ID: <6b9c433aaf8dfa15e6fc.1226309692@HelionPrime> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: ehrhardt@linux.vnet.ibm.com, hollisb@us.ibm.com To: kvm@vger.kernel.org, avi@redhat.com Return-path: Received: from mtagate8.uk.ibm.com ([195.212.29.141]:33317 "EHLO mtagate8.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754060AbYKJJgC (ORCPT ); Mon, 10 Nov 2008 04:36:02 -0500 Received: from d06nrmr1407.portsmouth.uk.ibm.com (d06nrmr1407.portsmouth.uk.ibm.com [9.149.38.185]) by mtagate8.uk.ibm.com (8.13.8/8.13.8) with ESMTP id mAA9Yso9455882 for ; Mon, 10 Nov 2008 09:34:54 GMT Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by d06nrmr1407.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id mAA9Ysbe4440138 for ; Mon, 10 Nov 2008 09:34:54 GMT Received: from d06av04.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id mAA9YrJo022601 for ; Mon, 10 Nov 2008 09:34:53 GMT Sender: kvm-owner@vger.kernel.org List-ID: From: Christian Ehrhardt These two patches went in with a conflict: changeset: 16724:3ce8c651c948 user: Ehrhardt Christian date: Tue Nov 04 12:10:51 2008 +0200 summary: kvm: qemu: move x86 specific calls introduced by device assignement to x86 files changeset: 16723:c445df2fedcb parent: 16675:cc9efba63149 user: Xiantao Zhang date: Mon Nov 03 17:56:15 2008 +0200 summary: kvm: qemu: fix ia64 build breakage. The final solution is to drop that io.h include in qemu-kvm.c completely. After 16724 is applied there is no need for it in qemu-kvm.c anymore (16724 removed the original include). Signed-off-by: Christian Ehrhardt --- [diffstat] [diff] diff --git a/qemu/qemu-kvm.c b/qemu/qemu-kvm.c --- a/qemu/qemu-kvm.c +++ b/qemu/qemu-kvm.c @@ -1049,8 +1049,6 @@ return kvm_unregister_coalesced_mmio(kvm_context, addr, size); } -#include - #ifdef USE_KVM_DEVICE_ASSIGNMENT void kvm_ioperm(CPUState *env, void *data) {