From: Linus Torvalds <torvalds@linux-foundation.org>
To: Dave Airlie <airlied@linux.ie>
Cc: dri-devel@lists.sf.net, linux-kernel@vger.kernel.org
Subject: Re: [git pull] drm request 2
Date: Tue, 2 Mar 2010 15:03:36 -0800 (PST) [thread overview]
Message-ID: <alpine.LFD.2.00.1003021459450.3616@localhost.localdomain> (raw)
In-Reply-To: <alpine.LFD.2.00.1003021451130.3616@localhost.localdomain>
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
next prev parent reply other threads:[~2010-03-02 23:03 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-01 23:46 Dave Airlie
2010-03-02 22:59 ` Linus Torvalds
2010-03-02 23:02 ` Dave Airlie
2010-03-02 23:06 ` Linus Torvalds
2010-03-02 23:09 ` Linus Torvalds
2010-03-03 11:12 ` Thomas Backlund
2010-03-02 23:03 ` Linus Torvalds [this message]
2010-03-02 23:16 ` Dave Airlie
2010-03-02 23:27 ` Dave Airlie
2010-03-02 23:40 ` Linus Torvalds
2010-03-02 23:48 ` Dave Airlie
2010-03-03 0:34 ` Linus Torvalds
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LFD.2.00.1003021459450.3616@localhost.localdomain \
--to=torvalds@linux-foundation.org \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.sf.net \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®