rpms/kernel/devel patch-2.6.31-rc7-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.1118, 1.1119 kernel.spec, 1.1746, 1.1747 sources, 1.1076, 1.1077 upstream, 1.990, 1.991 patch-2.6.31-rc7-git5.bz2.sign, 1.1, NONE xen-fb-probe-fix.patch, 1.1, NONE

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.31-rc7-git6.bz2.sign 
Removed Files:
	patch-2.6.31-rc7-git5.bz2.sign xen-fb-probe-fix.patch 
Log Message:
2.6.31-rc7-git6
Drop patch merged upstream:
  xen-fb-probe-fix.patch


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

iD8DBQBKlx+0yGugalF9Dw4RAghpAKCQAE2V74AZWfevPaoPM7MxE7mLLACeKB0l
hlDncp+6W3dJ+Ejc+DOBTe0=
=DtCa
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1118
retrieving revision 1.1119
diff -u -p -r1.1118 -r1.1119
--- .cvsignore	27 Aug 2009 13:32:33 -0000	1.1118
+++ .cvsignore	28 Aug 2009 00:31:35 -0000	1.1119
@@ -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-git5.bz2
+patch-2.6.31-rc7-git6.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1746
retrieving revision 1.1747
diff -u -p -r1.1746 -r1.1747
--- kernel.spec	27 Aug 2009 18:58:31 -0000	1.1746
+++ kernel.spec	28 Aug 2009 00:31:35 -0000	1.1747
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 7
 # The git snapshot level
-%define gitrev 5
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -725,9 +725,6 @@ Patch11010: via-hwmon-temp-sensor.patch
 Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 
-# fix xen boot
-Patch12020: xen-fb-probe-fix.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1342,9 +1339,6 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 
 # Patches headed upstream
 
-# fix xen boot
-ApplyPatch xen-fb-probe-fix.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2011,6 +2005,11 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc7-git6
+- Drop patch merged upstream:
+  xen-fb-probe-fix.patch
+
 * Thu Aug 27 2009 Adam Jackson <ajax at redhat.com>
 - drm-rv710-ucode-fix.patch: Treat successful microcode load on RV710 as,
   you know, success. (#519718)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1076
retrieving revision 1.1077
diff -u -p -r1.1076 -r1.1077
--- sources	27 Aug 2009 13:32:34 -0000	1.1076
+++ sources	28 Aug 2009 00:31:35 -0000	1.1077
@@ -1,3 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 4b991833a7e19a5b65ba3abcbc9de2e0  patch-2.6.31-rc7.bz2
-b31e020fe330d8927d12e25b051704c8  patch-2.6.31-rc7-git5.bz2
+59a009dd342443a5d53e331daa68ddf2  patch-2.6.31-rc7-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.990
retrieving revision 1.991
diff -u -p -r1.990 -r1.991
--- upstream	27 Aug 2009 13:32:34 -0000	1.990
+++ upstream	28 Aug 2009 00:31:35 -0000	1.991
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc7.bz2
-patch-2.6.31-rc7-git5.bz2
+patch-2.6.31-rc7-git6.bz2


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


--- xen-fb-probe-fix.patch DELETED ---