[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1233736675.3198.17.camel@localhost.localdomain>
Date: Wed, 04 Feb 2009 14:07:55 +0530
From: Jaswinder Singh Rajput <jaswinder@...nel.org>
To: Avi Kivity <avi@...hat.com>
Cc: Herbert Xu <herbert@...dor.apana.org.au>, mingo@...e.hu,
x86@...nel.org, sam@...nborg.org, hpa@...or.com,
jirislaby@...il.com, gregkh@...e.de, davem@...emloft.net,
xyzzy@...akeasy.org, arnd@...db.de, mchehab@...radead.org,
jens.axboe@...cle.com, linux-media@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL -tip] fix 22 make headers_check - 200901
On Wed, 2009-02-04 at 10:13 +0200, Avi Kivity wrote:
> Jaswinder Singh Rajput wrote:
> > On Wed, 2009-02-04 at 17:43 +1100, Herbert Xu wrote:
> >
> >> Jaswinder Singh Rajput <jaswinder@...nel.org> 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).
>
Welcome back :-)
> > 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.
>
Thanks,
--
JSR
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists