Thu Sep 24 19:48:13 UTC 2009

Author: cebbert

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

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.31.1.bz2.sign 
Removed Files:
	linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch 
	linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch 
	linux-2.6-scsi-sd-fix-oops-during-scanning.patch 
	linux-2.6-scsi-sg-fix-oops-in-error-path.patch 
	linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch 
Log Message:
Linux 2.6.31.1
Drop patches merged upstream:
    linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
    linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
    linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
    linux-2.6-scsi-sd-fix-oops-during-scanning.patch
    linux-2.6-scsi-sg-fix-oops-in-error-path.patch

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

iD8DBQBKu7QfyGugalF9Dw4RAsOXAJsFcZg2T7EeVt3LtEOQ9kw1QMUgagCff6bk
9tVlqfN7sHAgL+N2XFIir1o=
=6zvK
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/.cvsignore,v
retrieving revision 1.1126
retrieving revision 1.1127
diff -u -p -r1.1126 -r1.1127
--- .cvsignore	10 Sep 2009 00:43:48 -0000	1.1126
+++ .cvsignore	24 Sep 2009 19:48:11 -0000	1.1127
@@ -5,3 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
+patch-2.6.31.1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1827
retrieving revision 1.1828
diff -u -p -r1.1827 -r1.1828
--- kernel.spec	24 Sep 2009 16:22:11 -0000	1.1827
+++ kernel.spec	24 Sep 2009 19:48:11 -0000	1.1828
@@ -40,7 +40,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 0
+%define stable_update 1
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -692,9 +692,6 @@ Patch1550: linux-2.6-ksm.patch
 Patch1551: linux-2.6-ksm-kvm.patch
 Patch1552: linux-2.6-ksm-updates.patch
 Patch1553: linux-2.6-ksm-fix-munlock.patch
-Patch1575: linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
-Patch1576: linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
-Patch1577: linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
 Patch1578: linux-2.6-xen-stack-protector-fix.patch
 Patch1579: linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 
@@ -751,9 +748,6 @@ Patch13000: ppc-hates-my-family-and-swor
 
 # patches headed for -stable
 
-# scsi oops fixes
-Patch14000: linux-2.6-scsi-sd-fix-oops-during-scanning.patch
-Patch14001: linux-2.6-scsi-sg-fix-oops-in-error-path.patch
 # Raid10 lockdep fix
 Patch14002: linux-2.6-raidlockdep.patch
 
@@ -1359,9 +1353,6 @@ ApplyPatch linux-2.6-ksm-fix-munlock.pat
 ApplyPatch linux-2.6-ksm-kvm.patch
 
 # Assorted Virt Fixes
-ApplyPatch linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
-ApplyPatch linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
-ApplyPatch linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
 ApplyPatch linux-2.6-xen-stack-protector-fix.patch
 ApplyPatch linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 
@@ -1411,9 +1402,6 @@ ApplyPatch linux-2.6-selinux-module-load
 
 # patches headed for -stable
 
-# scsi oops fixes
-ApplyPatch linux-2.6-scsi-sd-fix-oops-during-scanning.patch
-ApplyPatch linux-2.6-scsi-sg-fix-oops-in-error-path.patch
 # Raid10 lockdep fix
 ApplyPatch linux-2.6-raidlockdep.patch
 
@@ -2073,6 +2061,15 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.1-41
+- Linux 2.6.31.1
+- Drop patches merged upstream:
+    linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
+    linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
+    linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
+    linux-2.6-scsi-sd-fix-oops-during-scanning.patch
+    linux-2.6-scsi-sg-fix-oops-in-error-path.patch
+
 * Thu Sep 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-40
 - Drop the modules-ro-nx patch: it's causing ftrace to be unable
   to NOP out module function call tracking. (#524042)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/sources,v
retrieving revision 1.1084
retrieving revision 1.1085
diff -u -p -r1.1084 -r1.1085
--- sources	10 Sep 2009 00:43:49 -0000	1.1084
+++ sources	24 Sep 2009 19:48:12 -0000	1.1085
@@ -1 +1,2 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
+43977a0a264dd7d173b6ef122c62fb20  patch-2.6.31.1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/upstream,v
retrieving revision 1.998
retrieving revision 1.999
diff -u -p -r1.998 -r1.999
--- upstream	10 Sep 2009 00:43:49 -0000	1.998
+++ upstream	24 Sep 2009 19:48:13 -0000	1.999
@@ -1 +1,2 @@
 linux-2.6.31.tar.bz2
+patch-2.6.31.1.bz2


--- linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch DELETED ---


--- linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch DELETED ---


--- linux-2.6-scsi-sd-fix-oops-during-scanning.patch DELETED ---


--- linux-2.6-scsi-sg-fix-oops-in-error-path.patch DELETED ---


--- linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch DELETED ---


