Hi Linus,
Please pull the 'agp-patches' branch from

ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git agp-patches
This contains a fix for a mapping race from Jan, some pci ids from via

via Greg, Intel bugfix + new pci ids, and bool/whitespace cleanups.
Dave.
 drivers/char/agp/agp.h          |    6 +-

 drivers/char/agp/alpha-agp.c    |    4 +-

 drivers/char/agp/amd-k7-agp.c   |    4 +-

 drivers/char/agp/amd64-agp.c    |    4 +-

 drivers/char/agp/ati-agp.c      |    4 +-

 drivers/char/agp/backend.c      |   16 ++--

 drivers/char/agp/compat_ioctl.c |    2 +-

 drivers/char/agp/efficeon-agp.c |    6 +-

 drivers/char/agp/frontend.c     |   12 +-

 drivers/char/agp/generic.c      |   35 +++---

 drivers/char/agp/hp-agp.c       |    6 +-

 drivers/char/agp/i460-agp.c     |    2 +-

 drivers/char/agp/intel-agp.c    |  235 +++++++++++++++++++++++++--------------

 drivers/char/agp/nvidia-agp.c   |    4 +-

 drivers/char/agp/parisc-agp.c   |    6 +-

 drivers/char/agp/sgi-agp.c      |    8 +-

 drivers/char/agp/sworks-agp.c   |    6 +-

 drivers/char/agp/uninorth-agp.c |   10 +-

 drivers/char/agp/via-agp.c      |   13 ++-

 include/linux/agp_backend.h     |   16 +--

 include/linux/agpgart.h         |    4 +-

 21 files changed, 235 insertions(+), 168 deletions(-)
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>
commit 25ce77abf8be3a96b3673e46722a9bd05f149584

Author: Zhenyu Wang <zhenyu.z.wang@intel.com>

Date:   Thu Jun 19 14:17:58 2008 +1000
    [AGP] intel_agp: Add support for Intel 4 series chipsets
    Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com>

    Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 598d14482380312939a3e3a4ae0657eb6b50a532

Author: Zhenyu Wang <zhenyu.z.wang@intel.com>

Date:   Thu Jun 19 14:00:...
[ message continues ]

I'm sorry, Dave. This one seems missing from 4 series chipset enabling

patch, sorry I forgot those chipset flush setup, pls apply this.
Thanks.
[AGP] intel_agp: setup chipset flush like i965 for 4 series chipsets
Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com>

---

 drivers/char/agp/intel-agp.c |    3 +--

 1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c

index 1ae64bb..acc4bd5 100644

--- a/drivers/char/agp/intel-agp.c

+++ b/drivers/char/agp/intel-agp.c

@@ -947,8 +947,7 @@ static void intel_i9xx_setup_flush(void)

 	intel_private.ifp_resource.name =3D "Intel Flush Page";

 	intel_private.ifp_resource.flags =3D IORESOURCE_MEM;

=20

-	/* Setup chipset flush for 915 */

-	if (IS_I965 || IS_G33) {

+	if (IS_I965 || IS_G33 || IS_G4X) {

 		intel_i965_g33_setup_chipset_flush();

 	} else {

 		intel_i915_setup_chipset_flush();

--=20

1.5.4
--=20

Open Source Technology Center, Intel ltd.
$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827

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

--

DAMNIT.
I can't believe that happened, I going to stop doing whitespace cleanups

now, I just got shocked when I realised how much 7 space indents that file

has.
You are right please put back the two lines as per the attached patch.
Dave.