rpms/kernel/devel patch-2.6.31-rc7-git4.bz2.sign, NONE, 1.1 .cvsignore, 1.1116, 1.1117 kernel.spec, 1.1740, 1.1741 sources, 1.1074, 1.1075 upstream, 1.988, 1.989 patch-2.6.31-rc7-git2.bz2.sign, 1.1, NONE xen-x86-fix-stackprotect.patch, 1.1, NONE xen-x86-no-stackprotect.patch, 1.1, NONE

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.31-rc7-git4.bz2.sign 
Removed Files:
	patch-2.6.31-rc7-git2.bz2.sign xen-x86-fix-stackprotect.patch 
	xen-x86-no-stackprotect.patch 
Log Message:
2.6.31-rc7-git4
Drop patches merged upstream:
  xen-x86-fix-stackprotect.patch
  xen-x86-no-stackprotect.patch


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

iD4DBQBKlSaJyGugalF9Dw4RAvx8AJkBOxwrd1XXzRAZCf/qEUTX9daFjwCYln/P
K6GN3ry0CMcWKkcjWGgwnA==
=ZSyc
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1116
retrieving revision 1.1117
diff -u -p -r1.1116 -r1.1117
--- .cvsignore	25 Aug 2009 00:43:51 -0000	1.1116
+++ .cvsignore	26 Aug 2009 15:50:19 -0000	1.1117
@@ -6,4 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc7.bz2
-patch-2.6.31-rc7-git2.bz2
+patch-2.6.31-rc7-git4.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1740
retrieving revision 1.1741
diff -u -p -r1.1740 -r1.1741
--- kernel.spec	26 Aug 2009 13:58:24 -0000	1.1740
+++ kernel.spec	26 Aug 2009 15:50:19 -0000	1.1741
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 7
 # The git snapshot level
-%define gitrev 2
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -725,8 +725,6 @@ Patch12011: linux-2.6-block-silently-err
 
 # fix xen boot
 Patch12020: xen-fb-probe-fix.patch
-Patch12021: xen-x86-fix-stackprotect.patch
-Patch12022: xen-x86-no-stackprotect.patch
 
 Patch90000: allow-disabling-ima.diff
 
@@ -1344,8 +1342,6 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 
 # fix xen boot
 ApplyPatch xen-fb-probe-fix.patch
-ApplyPatch xen-x86-fix-stackprotect.patch
-ApplyPatch xen-x86-no-stackprotect.patch
 
 ApplyPatch allow-disabling-ima.diff
 
@@ -2015,6 +2011,12 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 26 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc7-git4
+- Drop patches merged upstream:
+  xen-x86-fix-stackprotect.patch
+  xen-x86-no-stackprotect.patch
+
 * Wed Aug 26 2009 Adam Jackson <ajax at redhat.com>
 - drm-intel-next.patch: Update, various output setup fixes.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1074
retrieving revision 1.1075
diff -u -p -r1.1074 -r1.1075
--- sources	25 Aug 2009 00:43:51 -0000	1.1074
+++ sources	26 Aug 2009 15:50:19 -0000	1.1075
@@ -1,3 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 4b991833a7e19a5b65ba3abcbc9de2e0  patch-2.6.31-rc7.bz2
-fb0cac7a741028e2ef185e8e87a51515  patch-2.6.31-rc7-git2.bz2
+8329c25267787e591972e477b113c08b  patch-2.6.31-rc7-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.988
retrieving revision 1.989
diff -u -p -r1.988 -r1.989
--- upstream	25 Aug 2009 00:43:51 -0000	1.988
+++ upstream	26 Aug 2009 15:50:19 -0000	1.989
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc7.bz2
-patch-2.6.31-rc7-git2.bz2
+patch-2.6.31-rc7-git4.bz2


--- patch-2.6.31-rc7-git2.bz2.sign DELETED ---


--- xen-x86-fix-stackprotect.patch DELETED ---


--- xen-x86-no-stackprotect.patch DELETED ---