Re: [PATCH] x86: more header fixes

[Ingo Molnar]

* Vegard Nossum <vegard.nossum@xxxxxxxxx> wrote:

> On Wed, Jul 16, 2008 at 1:51 PM, Ingo Molnar <mingo@xxxxxxx> wrote:
> >
> > * Ingo Molnar <mingo@xxxxxxx> wrote:
> >
> >> * Vegard Nossum <vegard.nossum@xxxxxxxxx> wrote:
> >>
> >> > > or perhaps we could include it in tip/master right now as well, if
> >> > > you did another branch that excluded the files below. That would
> >> > > make merging a lot easier - and we could do a second phase in
> >> > > v2.6.27-rc1. Hm?
> >> >
> >> > I don't think we really need to resolve conflicts at all. What we
> >> > can do is simply to re-run the scripts against tip/master whenever
> >> > you want the update.
> >>
> >> ok, lets do it that way.
> >
> > ... the right moment for this would be about now. Mind rerunning your
> > scripts and create a pullable linux-2.6-headers tree, based on latest
> > -git?
> 
> Aright! Here she is; you may pull the 'for-tip' branch of
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/vegard/linux-2.6-headers.git
> for-tip
> 
> To see the result. This was based on tip/master. Shortlog:
>
> Vegard Nossum (3):
>       x86: consolidate header guards
>       kvm: fix spurious '#' in header
>       kvm: consolidate header guard

thanks. I've picked up these changes and rebased them to -git. (that way 
they can be maintained as a topic easier) The few files that were left 
out due to conflicts we can do later on. I pushed the result out into 
the tip/x86/header-guards topic branch - please double-check that i 
merged it right.

	Ingo
--
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/