[lkml]   [2010]   [Mar]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: [git pull] drm request 2

    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

    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".

    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to
    More majordomo info at
    Please read the FAQ at

     \ /
      Last update: 2010-03-03 00:05    [W:0.045 / U:14.044 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site