Re: [GIT PULL] x86/cpufeature for v2.6.31

[Ingo Molnar]

* Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:

> 
> 
> On Wed, 10 Jun 2009, Ingo Molnar wrote:
> > 
> > Please pull the latest x86-cpufeature-for-linus git tree from:
> > 
> >    git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-cpufeature-for-linus
> 
> Hmm. This was already part of the irq-tree.

Ah, sorry - due to:

 commit ee4c24a5c9b530481394132c8dbc10572d57c075
 Merge: 3d58f48... 3e0c373...
 Author: Ingo Molnar <mingo@xxxxxxx>
 Date:   Mon Jun 1 22:29:35 2009 +0200

    Merge branch 'x86/cpufeature' into irq/numa
    
    Merge reason: irq/numa didnt build because this commit:
    
      2759c32: x86: don't call read_apic_id if !cpu_has_apic
    
    Had a dependency on x86/cpufeature changes. Pull in that
    (small) branch to fix the dependency.
    
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

This seemed like one of the exceptions to do that merge - 
x86/cpufeature is a narrow 'infrastructure' topic we keep around 
during the development window, because we found it in the past that 
cpufeature changes frequently cause conflicts and merge 
dependencies. The cpufeatres commits are always kept uninteresting 
and non-controversial.

So technically it's a cross-tree merge, but of the good and 
exceptional kind ... i hope :-/

> (But at least so far, this merge window looks much cleaner wrt x86 
> merges.

Thanks :)

> [...] I'm hoping there are no nasty surprises down the line ;)

There are none planned! :-)

	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/