Re: [GIT PULL -tip] fix 22 make headers_check - 200901

From: Avi Kivity
Date: Wed Feb 04 2009 - 03:13:47 EST


Jaswinder Singh Rajput wrote:
On Wed, 2009-02-04 at 17:43 +1100, Herbert Xu wrote:
Jaswinder Singh Rajput <jaswinder@xxxxxxxxxx> wrote:
diff --git a/arch/x86/include/asm/kvm.h b/arch/x86/include/asm/kvm.h
index b95162a..d2e3bf3 100644
--- a/arch/x86/include/asm/kvm.h
+++ b/arch/x86/include/asm/kvm.h
@@ -6,7 +6,7 @@
*
*/

-#include <asm/types.h>
+#include <linux/types.h>
#include <linux/ioctl.h>
Awesome, you've just broken the userspace build of kvm as the
file linux/types.h conflicts with sys/types.h.


What I did is absolutely right.


It was, though I'd have been happy to know about it in advance (maybe you did notify me; I was on vacation and haven't cleared the backlog yet).

If there is any conflict then we need to solve it in better way.

Can you please share what is the conflict and what you are expecting and
what you are getting.

I've already fixed kvm-userspace.git.

--
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/