[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20080726130840.GA14466@elte.hu>
Date: Sat, 26 Jul 2008 15:08:40 +0200
From: Ingo Molnar <mingo@...e.hu>
To: Vegard Nossum <vegard.nossum@...il.com>
Cc: linux-kernel@...r.kernel.org,
the arch/x86 maintainers <x86@...nel.org>,
Peter Zijlstra <a.p.zijlstra@...llo.nl>
Subject: Re: [PATCH] x86: more header fixes
* Vegard Nossum <vegard.nossum@...il.com> wrote:
> On Tue, Jul 22, 2008 at 1:38 PM, Ingo Molnar <mingo@...e.hu> wrote:
> >> Though I still believe it should be squashed for bisectability.
> >
> > hm, i pulled it but 1ab9e368 cannot be squashed into aa27f9586 cleanly.
>
> Yes, you are right. I forgot to check.
>
> > I'd suggest the following approach, which we used for the scripted
> > unification of arch/x86. Do a couple of preparatory patches that just
> > bring all the header guards into proper shape. _Then_ run the script
> > against that "prepared" tree. The end result should be correct to the
> > best of our current knowledge. (i'll figure out any remaining build
> > breakages quickly - i can build 120+ random kernels per hour)
> >
> > We can rebase x86/header-guards to such a bisectable approach no problem
> > if you can do it like that, it's not yet merged anywhere. Just send me a
> > pull URI that i'll pull into a x86/header-guards that is reset back to
> > linus/master.
> >
> > Can you see any complications with that approach?
>
> There's not really that much to prepare. But it really helps to work
> against the right tree to begin with :-)
>
> So here's another one, this time prepared against linus/master, and
> fully bisectable by delaying the fixing of the headers which have
> external users of their guard-names. Check out the (new) 'for-tip'
> branch of
>
> git://git.kernel.org/pub/scm/linux/kernel/git/vegard/linux-2.6-headers.git
>
> There are still headers left which have no guard at all; that's okay.
> If they should be changed, it can be done later, it shouldn't make a
> difference for now.
pulled into tip/x86/header-guards, thanks Vegard.
One small request: in the future, could you use git-request-pull to
generate pull requests?
That way the full URI is included (otherwise it's easy to forget to add
the 'for-tip' branch to the pull i do, etc.). Something like:
git-request-pull linus/master \
git://git.kernel.org/pub/scm/linux/kernel/git/vegard/linux-2.6-headers.git \
for-tip
should do the trick. Thanks,
Ingo
--
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