Re: [git pull, take 2] x86 updates for v2.6.28, phase #4, x2apic,unify-cpu-detect

[Linus Torvalds]

On Fri, 10 Oct 2008, Ingo Molnar wrote:
> 
> Please pull the latest x86-v28-for-linus-phase4-B git tree from:
> 
>    git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-v28-for-linus-phase4-B

This is broken.

I get an absolute metric shitload of:

	include/asm/dma-mapping.h:309:2: error: #endif without #if

errors, and I suspect it's because of some broken merge resolution that 
you didn't even test and then fixed in some later branch.

I double-checked: it's already broken in your tree, it's not from my 
merge (ie commit 0d4ab8b5aa74f6be4d022dcf5e27845b7c290294 is already 
showing that bug).

Not pulled.

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