Re: [git pull] drm request 2

[Linus Torvalds]

On Tue, 2 Mar 2010, Linus Torvalds wrote:
> 
> I disabled it in the merge, since I had to fix up that file anyway. But 
> please don't make me do these so-called "evil merges" where I end up 
> modifying the thing I merge.

Never mind. I've unpulled the whole effin' mess since it doesn't even 
compile:

	drivers/gpu/drm/nouveau/nouveau_acpi.c:191: error: redefinition of ʽnouveau_register_dsm_handlerʼ
	drivers/gpu/drm/nouveau/nouveau_drv.h:859: note: previous definition of ʽnouveau_register_dsm_handlerʼ was here
	drivers/gpu/drm/nouveau/nouveau_acpi.c:202: error: redefinition of ʽnouveau_unregister_dsm_handlerʼ
	drivers/gpu/drm/nouveau/nouveau_drv.h:860: note: previous definition of ʽnouveau_unregister_dsm_handlerʼ was here

because not only was that VGA_SWITCHEROO Kconfig default the wrong way 
around, the thing had clearly never ever been tested at all.

Why does sh*t like this even make it to me? Was this ever at all in -next? 
I assume not, since that would have picked up on basic compile failures.

Grr. Things like this is what makes me go "Ok, there's always the next 
merge window, maybe it will have gotten some testing by then".

		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/