rpms/kernel/F-12 patch-2.6.31.4-rc2.bz2.sign, NONE, 1.1 .cvsignore, 1.1128, 1.1129 kernel.spec, 1.1857, 1.1858 linux-2.6-compile-fixes.patch, 1.195, 1.196 sources, 1.1086, 1.1087 upstream, 1.1000, 1.1001 linux-2.6-frace-fixes.patch, 1.1, NONE

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	.cvsignore kernel.spec linux-2.6-compile-fixes.patch sources 
	upstream 
Added Files:
	patch-2.6.31.4-rc2.bz2.sign 
Removed Files:
	linux-2.6-frace-fixes.patch 
Log Message:
Linux 2.6.31.4-rc2
Drop merged patch: linux-2.6-frace-fixes.patch


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

iD8DBQBKz9RqyGugalF9Dw4RAqqwAJsHgo/2C7136Itq1MXx7s6CRXxHTgCggMai
hlt+pP4znd1q/PNMgeYqAhg=
=gUjK
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/.cvsignore,v
retrieving revision 1.1128
retrieving revision 1.1129
diff -u -p -r1.1128 -r1.1129
--- .cvsignore	8 Oct 2009 18:49:26 -0000	1.1128
+++ .cvsignore	11 Oct 2009 13:37:45 -0000	1.1129
@@ -6,3 +6,4 @@ temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
 patch-2.6.31.3.bz2
+patch-2.6.31.4-rc2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1857
retrieving revision 1.1858
diff -u -p -r1.1857 -r1.1858
--- kernel.spec	11 Oct 2009 02:23:13 -0000	1.1857
+++ kernel.spec	11 Oct 2009 13:37:45 -0000	1.1858
@@ -40,9 +40,9 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 3
+%define stable_update 4
 # Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 2
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -737,7 +737,6 @@ Patch12013: linux-2.6-rfkill-all.patch
 Patch12014: linux-2.6-selinux-module-load-perms.patch
 
 # patches headed for -stable
-Patch13000: linux-2.6-frace-fixes.patch
 
 # Raid10 lockdep fix
 Patch14002: linux-2.6-raidlockdep.patch
@@ -1381,7 +1380,6 @@ ApplyPatch linux-2.6-rfkill-all.patch
 ApplyPatch linux-2.6-selinux-module-load-perms.patch
 
 # patches headed for -stable
-ApplyPatch linux-2.6-frace-fixes.patch
 
 # Raid10 lockdep fix
 ApplyPatch linux-2.6-raidlockdep.patch
@@ -2045,6 +2043,10 @@ fi
 # and build.
 
 %changelog
+* Sun Oct 11 2009 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.31.4-rc2
+- Drop merged patch: linux-2.6-frace-fixes.patch
+
 * Sat Oct 10 2009 Chuck Ebbert <cebbert at redhat.com>
 - Make performance counter API available to userspace programs (#527264)
 

linux-2.6-compile-fixes.patch:
 svm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6-compile-fixes.patch,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- linux-2.6-compile-fixes.patch	10 Jul 2009 21:10:10 -0000	1.195
+++ linux-2.6-compile-fixes.patch	11 Oct 2009 13:37:46 -0000	1.196
@@ -4,3 +4,19 @@
 # Please add the errors from gcc before the diffs to save others having
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
+kvm: svm: fix build
+
+arch/x86/kvm/svm.c: In function 'svm_vcpu_load':
+arch/x86/kvm/svm.c:713: error: 'struct vcpu_svm' has no member named 'nested'
+
+--- linux-2.6.31.noarch.orig/arch/x86/kvm/svm.c
++++ linux-2.6.31.noarch/arch/x86/kvm/svm.c
+@@ -710,7 +710,7 @@ static void svm_vcpu_load(struct kvm_vcp
+ 		delta = vcpu->arch.host_tsc - tsc_this;
+ 		svm->vmcb->control.tsc_offset += delta;
+ 		if (is_nested(svm))
+-			svm->nested.hsave->control.tsc_offset += delta;
++			svm->hsave->control.tsc_offset += delta;
+ 		vcpu->cpu = cpu;
+ 		kvm_migrate_timers(vcpu);
+ 		svm->asid_generation = 0;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/sources,v
retrieving revision 1.1086
retrieving revision 1.1087
diff -u -p -r1.1086 -r1.1087
--- sources	8 Oct 2009 18:49:28 -0000	1.1086
+++ sources	11 Oct 2009 13:37:47 -0000	1.1087
@@ -1,2 +1,3 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
 24d60ad6645211e2c08dc1c1c578b249  patch-2.6.31.3.bz2
+f1fa28b0178eab2f486d2ac5e1120cc1  patch-2.6.31.4-rc2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/upstream,v
retrieving revision 1.1000
retrieving revision 1.1001
diff -u -p -r1.1000 -r1.1001
--- upstream	8 Oct 2009 18:49:28 -0000	1.1000
+++ upstream	11 Oct 2009 13:37:47 -0000	1.1001
@@ -1,2 +1,3 @@
 linux-2.6.31.tar.bz2
 patch-2.6.31.3.bz2
+patch-2.6.31.4-rc2.bz2


--- linux-2.6-frace-fixes.patch DELETED ---