rpms/kernel/devel TODO, 1.66, 1.67 kernel.spec, 1.1823, 1.1824 drm-vga-arb.patch, 1.7, NONE linux-2.6-vga-arb.patch, 1.7, NONE

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12944

Modified Files:
	TODO kernel.spec 
Removed Files:
	drm-vga-arb.patch linux-2.6-vga-arb.patch 
Log Message:
* Tue Oct 13 2009 Dave Airlie <airlied at redhat.com>
- cleanup some of drm vga arb bits that are upstream



Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/TODO,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- TODO	3 Aug 2009 13:25:54 -0000	1.66
+++ TODO	12 Oct 2009 20:44:19 -0000	1.67
@@ -83,7 +83,3 @@
 
 * linux-2.6-kmemleak-improvements.patch
 	will go upstream for .31
-
-* linux-2.6-vga-arb.patch
-* drm-vga-arb.patch
-	will go upstream for .32


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1823
retrieving revision 1.1824
diff -u -p -r1.1823 -r1.1824
--- kernel.spec	12 Oct 2009 16:03:11 -0000	1.1823
+++ kernel.spec	12 Oct 2009 20:44:19 -0000	1.1824
@@ -673,7 +673,6 @@ Patch1551: linux-2.6-ksm-kvm.patch
 Patch1579: linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 
 # nouveau + drm fixes
-Patch1812: drm-next.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
@@ -683,9 +682,6 @@ Patch1821: drm-page-flip.patch
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 
-# vga arb
-Patch1901: drm-vga-arb.patch
-
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
 
@@ -1295,8 +1291,6 @@ ApplyPatch linux-2.6-virtio_blk-revert-Q
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
-#ApplyPatch drm-next.patch
-
 #ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
 #ApplyPatch drm-radeon-pm.patch
@@ -1307,9 +1301,6 @@ ApplyOptionalPatch drm-intel-next.patch
 #this appears to be upstream - mjg59?
 #ApplyPatch drm-intel-pm.patch
 
-# VGA arb + drm
-#ApplyPatch drm-vga-arb.patch
-
 # linux1394 git patches
 #ApplyPatch linux-2.6-firewire-git-update.patch
 #ApplyOptionalPatch linux-2.6-firewire-git-pending.patch
@@ -1985,6 +1976,9 @@ fi
 # ##############################################################
 
 %changelog
+* Tue Oct 13 2009 Dave Airlie <airlied at redhat.com>
+- cleanup some of drm vga arb bits that are upstream
+
 * Mon Oct 12 2009 Jarod Wilson <jarod at redhat.com>
 - Merge lirc compile fixes into lirc patch
 - Refresh lirc patch with additional irq handling fixage


--- drm-vga-arb.patch DELETED ---


--- linux-2.6-vga-arb.patch DELETED ---