Tue Jun 9 16:49:19 UTC 2009

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19628

Modified Files:
	.cvsignore kernel.spec linux-2.6-upstream-reverts.patch 
	sources upstream 
Added Files:
	patch-2.6.29.5-rc1.bz2.sign 
Removed Files:
	hpet-fixes.patch 
	keys-Handle-there-being-no-fallback-destination-key.patch 
	kvm-Fix-PDPTR-reloading-on-CR4-writes.patch 
	kvm-Make-paravirt-tlb-flush-also-reload-the-PAE-PDP.patch 
	linux-2.6-ptrace-fix-possible-zombie-leak.patch 
	linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch 
	linux-2.6-xen-xenbus_state_transition_when_not_connected.patch 
	linux-2.6.29.5-ext4-stable-fixes.patch 
Log Message:
2.6.29.5-rc1
Reverted from stable, patch already in drm-next:
    drm-r128-fix-r128-ioremaps-to-use-ioremap_wc.patch
Dropped patches, merged in -stable:
    hpet-fixes.patch
    keys-Handle-there-being-no-fallback-destination-key.patch
    kvm-Fix-PDPTR-reloading-on-CR4-writes.patch
    kvm-Make-paravirt-tlb-flush-also-reload-the-PAE-PDP.patch
    linux-2.6-ptrace-fix-possible-zombie-leak.patch
    linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch
    linux-2.6-xen-xenbus_state_transition_when_not_connected.patch
    linux-2.6.29.5-ext4-stable-fixes.patch

--- NEW FILE patch-2.6.29.5-rc1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKLjD/yGugalF9Dw4RAg5eAJ4kpPpghkpHa5SkOuLW+vAz/HFosACfSZOi
V3I87Wu1vrMiySTv3hrERwE=
=Z23Y
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/.cvsignore,v
retrieving revision 1.1044
retrieving revision 1.1045
diff -u -p -r1.1044 -r1.1045
--- .cvsignore	25 May 2009 20:11:10 -0000	1.1044
+++ .cvsignore	9 Jun 2009 16:48:44 -0000	1.1045
@@ -6,3 +6,4 @@ temp-*
 kernel-2.6.29
 linux-2.6.29.tar.bz2
 patch-2.6.29.4.bz2
+patch-2.6.29.5-rc1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1638
retrieving revision 1.1639
diff -u -p -r1.1638 -r1.1639
--- kernel.spec	9 Jun 2009 15:10:51 -0000	1.1638
+++ kernel.spec	9 Jun 2009 16:48:45 -0000	1.1639
@@ -37,9 +37,9 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 4
+%define stable_update 5
 # Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 1
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -594,7 +594,6 @@ Patch20: linux-2.6-hotfixes.patch
 Patch21: linux-2.6-tracehook.patch
 Patch22: linux-2.6-utrace.patch
 Patch23: linux-2.6-utrace-ftrace.patch
-Patch24: linux-2.6-ptrace-fix-possible-zombie-leak.patch
 
 # vm patches
 Patch25: linux-2.6-mm-lru-evict-streaming-io-pages-first.patch
@@ -609,8 +608,6 @@ Patch41: linux-2.6-sysrq-c.patch
 #Patch102: linux-2.6-e820-acpi3-bios-workaround.patch
 #Patch103: linux-2.6-e820-guard-against-pre-acpi3.patch
 
-Patch120: keys-Handle-there-being-no-fallback-destination-key.patch
-
 Patch141: linux-2.6-ps3-storage-alias.patch
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
@@ -735,23 +732,18 @@ Patch2902: linux-2.6-v4l-dvb-fix-uint16_
 Patch2903: linux-2.6-revert-dvb-net-kabi-change.patch
 
 # fs fixes
-# ext4 fixes, all from upstream (.30)
-Patch2920: linux-2.6.29.5-ext4-stable-fixes.patch
+# ext4 fixes
 
 Patch3000: linux-2.6-btrfs-unstable-update.patch
 Patch3010: linux-2.6-relatime-by-default.patch
 Patch3020: linux-2.6-fiemap-header-install.patch
 
-Patch4000: linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch
-
 Patch5000: linux-2.6-add-qcserial.patch
 
 # patches headed for -stable
 # fix squashfs on systems where pagesize > blocksize (ia64, ppc64 w/64k pages)
 Patch6010: squashfs-broken-when-pagesize-greater-than-blocksize.patch
 
-Patch9000: hpet-fixes.patch
-
 Patch9001: revert-fix-modules_install-via-nfs.patch
 
 Patch9002: cpufreq-add-atom-to-p4-clockmod.patch
@@ -764,11 +756,7 @@ Patch9200: linux-2.6-dropwatch-protocol.
 Patch9303: linux-2.6-kvm-skip-pit-check.patch
 Patch9304: linux-2.6-xen-check-for-nx-support.patch
 Patch9305: linux-2.6-xen-fix_warning_when_deleting_gendisk.patch
-Patch9306: linux-2.6-xen-xenbus_state_transition_when_not_connected.patch
 Patch9307: linux-2.6.29-xen-disable-gbpages.patch
-Patch9308: kvm-Fix-PDPTR-reloading-on-CR4-writes.patch
-Patch9309: kvm-Make-paravirt-tlb-flush-also-reload-the-PAE-PDP.patch
-
 
 %endif
 
@@ -1168,7 +1156,6 @@ ApplyPatch linux-2.6-hotfixes.patch
 ApplyPatch linux-2.6-tracehook.patch
 ApplyPatch linux-2.6-utrace.patch
 ApplyPatch linux-2.6-utrace-ftrace.patch
-ApplyPatch linux-2.6-ptrace-fix-possible-zombie-leak.patch
 
 # vm patches
 ApplyPatch linux-2.6-mm-lru-evict-streaming-io-pages-first.patch
@@ -1180,8 +1167,6 @@ ApplyPatch linux-2.6-iommu-fixes.patch
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
 
-ApplyPatch keys-Handle-there-being-no-fallback-destination-key.patch
-
 # Architecture patches
 # x86(-64)
 #ApplyPatch linux-2.6-e820-save-restore-edi-ebp.patch
@@ -1218,7 +1203,6 @@ ApplyPatch linux-2.6-execshield.patch
 #
 
 # ext4
-ApplyPatch linux-2.6.29.5-ext4-stable-fixes.patch
 
 # xfs
 
@@ -1233,7 +1217,6 @@ ApplyPatch linux-2.6-fiemap-header-insta
 
 # USB
 ApplyPatch linux-2.6-add-qcserial.patch
-ApplyPatch linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch
 
 # ACPI
 ApplyPatch linux-2.6-defaults-acpi-video.patch
@@ -1414,8 +1397,6 @@ ApplyPatch linux-2.6-revert-dvb-net-kabi
 # patches headed for -stable
 ApplyPatch squashfs-broken-when-pagesize-greater-than-blocksize.patch
 
-ApplyPatch hpet-fixes.patch
-
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
 ApplyPatch revert-fix-modules_install-via-nfs.patch
 
@@ -1428,10 +1409,7 @@ ApplyPatch linux-2.6-dropwatch-protocol.
 ApplyPatch linux-2.6-kvm-skip-pit-check.patch
 ApplyPatch linux-2.6-xen-check-for-nx-support.patch
 ApplyPatch linux-2.6-xen-fix_warning_when_deleting_gendisk.patch
-ApplyPatch linux-2.6-xen-xenbus_state_transition_when_not_connected.patch
 ApplyPatch linux-2.6.29-xen-disable-gbpages.patch
-ApplyPatch kvm-Fix-PDPTR-reloading-on-CR4-writes.patch
-ApplyPatch kvm-Make-paravirt-tlb-flush-also-reload-the-PAE-PDP.patch
 
 
 # END OF PATCH APPLICATIONS
@@ -2020,6 +1998,20 @@ fi
 # and build.
 
 %changelog
+* Tue Jun  9 2009 Chuck Ebbert <cebbert at redhat.com> - 2.6.29.5-177.rc1
+- 2.6.29.5-rc1
+- Reverted from stable, patch already in drm-next:
+    drm-r128-fix-r128-ioremaps-to-use-ioremap_wc.patch
+- Dropped patches, merged in -stable:
+    hpet-fixes.patch
+    keys-Handle-there-being-no-fallback-destination-key.patch
+    kvm-Fix-PDPTR-reloading-on-CR4-writes.patch
+    kvm-Make-paravirt-tlb-flush-also-reload-the-PAE-PDP.patch
+    linux-2.6-ptrace-fix-possible-zombie-leak.patch
+    linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch
+    linux-2.6-xen-xenbus_state_transition_when_not_connected.patch
+    linux-2.6.29.5-ext4-stable-fixes.patch
+
 * Tue Jun 09 2009 John W. Linville <linville at tuxdriver.com>
 - Clean-up some wireless bits in config-generic
 

linux-2.6-upstream-reverts.patch:

Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- linux-2.6-upstream-reverts.patch	12 Nov 2008 16:28:22 -0000	1.5
+++ linux-2.6-upstream-reverts.patch	9 Jun 2009 16:48:46 -0000	1.6
@@ -1 +1,37 @@
-nil
+From 42beefc0093725ec0f8cea340cc54c36ccaceea0 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at redhat.com>
+Date: Wed, 6 May 2009 09:04:52 +1000
+Subject: drm/r128: fix r128 ioremaps to use ioremap_wc.
+
+From: Dave Airlie <airlied at redhat.com>
+
+commit 42beefc0093725ec0f8cea340cc54c36ccaceea0 upstream.
+
+This should allow r128 to start working again since PAT changes.
+
+taken from F-11 kernel.
+
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+Cc: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/gpu/drm/r128/r128_cce.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/gpu/drm/r128/r128_cce.c
++++ b/drivers/gpu/drm/r128/r128_cce.c
+@@ -511,9 +511,9 @@ static int r128_do_init_cce(struct drm_d
+ 
+ #if __OS_HAS_AGP
+ 	if (!dev_priv->is_pci) {
+-		drm_core_ioremap(dev_priv->cce_ring, dev);
+-		drm_core_ioremap(dev_priv->ring_rptr, dev);
+-		drm_core_ioremap(dev->agp_buffer_map, dev);
++		drm_core_ioremap_wc(dev_priv->cce_ring, dev);
++		drm_core_ioremap_wc(dev_priv->ring_rptr, dev);
++		drm_core_ioremap_wc(dev->agp_buffer_map, dev);
+ 		if (!dev_priv->cce_ring->handle ||
+ 		    !dev_priv->ring_rptr->handle ||
+ 		    !dev->agp_buffer_map->handle) {
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/sources,v
retrieving revision 1.1006
retrieving revision 1.1007
diff -u -p -r1.1006 -r1.1007
--- sources	25 May 2009 20:11:10 -0000	1.1006
+++ sources	9 Jun 2009 16:48:46 -0000	1.1007
@@ -1,2 +1,3 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
 03f1a0236cc37d8594d2f3c837d81c9d  patch-2.6.29.4.bz2
+a8615710bb5074865b6a5518a86b0b17  patch-2.6.29.5-rc1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/upstream,v
retrieving revision 1.917
retrieving revision 1.918
diff -u -p -r1.917 -r1.918
--- upstream	25 May 2009 20:11:10 -0000	1.917
+++ upstream	9 Jun 2009 16:48:46 -0000	1.918
@@ -1,2 +1,3 @@
 linux-2.6.29.tar.bz2
 patch-2.6.29.4.bz2
+patch-2.6.29.5-rc1.bz2


--- hpet-fixes.patch DELETED ---


--- keys-Handle-there-being-no-fallback-destination-key.patch DELETED ---


--- kvm-Fix-PDPTR-reloading-on-CR4-writes.patch DELETED ---


--- kvm-Make-paravirt-tlb-flush-also-reload-the-PAE-PDP.patch DELETED ---


--- linux-2.6-ptrace-fix-possible-zombie-leak.patch DELETED ---


--- linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch DELETED ---


--- linux-2.6-xen-xenbus_state_transition_when_not_connected.patch DELETED ---


--- linux-2.6.29.5-ext4-stable-fixes.patch DELETED ---


