mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Dave Airlie <airlied@linux.ie>
Cc: Andrew Morton <akpm@linux-foundation.org>, linux-kernel@vger.kernel.org
Subject: Re: [git pull] agp patches for 2.6.26 final
Date: Wed, 18 Jun 2008 21:56:08 -0700 (PDT)	[thread overview]
Message-ID: <alpine.LFD.1.10.0806182153140.2907@woody.linux-foundation.org> (raw)
In-Reply-To: <alpine.DEB.0.82.0806190538490.14089@skynet.skynet.ie>



On Thu, 19 Jun 2008, Dave Airlie wrote:
> 
> commit 62c96b9d0917894c164aa3e474a3ff3bca1554ae
> Author: Dave Airlie <airlied@redhat.com>
> Date:   Thu Jun 19 14:27:53 2008 +1000
> 
>     agp/intel: cleanup some serious whitespace badness
>     
>     Signed-off-by: Dave Airlie <airlied@redhat.com>

Aarghh!

This one does _not_ just clean up whitespace. It also does

	@@ -1959,8 +1959,6 @@ static const struct agp_bridge_driver intel_i965_driver = {
	 	.size_type		= FIXED_APER_SIZE,
	 	.num_aperture_sizes	= 4,
	 	.needs_scratch_page	= true,
	-	.configure		= intel_i915_configure,
	-	.fetch_size		= intel_i9xx_fetch_size,
	 	.cleanup		= intel_i915_cleanup,
	 	.tlb_flush		= intel_i810_tlbflush,
	 	.mask_memory		= intel_i965_mask_memory,

which may well be all good, but it doesn't match the commit message.

I merged it, but please be more careful.

		Linus

  reply	other threads:[~2008-06-19  4:57 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-19  4:41 Dave Airlie
2008-06-19  4:56 ` Linus Torvalds [this message]
2008-06-19  5:01   ` Dave Airlie
2008-06-19  5:46 ` Zhenyu Wang

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.1.10.0806182153140.2907@woody.linux-foundation.org \
    --to=torvalds@linux-foundation.org \
    --cc=airlied@linux.ie \
    --cc=akpm@linux-foundation.org \
    --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®