rpms/kernel/devel patch-2.6.25-rc5-git3.bz2.sign, NONE, 1.1 .cvsignore, 1.780, 1.781 kernel.spec, 1.500, 1.501 sources, 1.740, 1.741 upstream, 1.662, 1.663 linux-2.6-ppc32-ucmpdi2.patch, 1.3, NONE patch-2.6.25-rc5-git2.bz2.sign, 1.1, NONE

[Kyle McMartin (kyle)]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14647

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.25-rc5-git3.bz2.sign 
Removed Files:
	linux-2.6-ppc32-ucmpdi2.patch patch-2.6.25-rc5-git2.bz2.sign 
Log Message:
* Thu Mar 13 2008 Kyle McMartin <kmcmartin at redhat.com>
- Linux 2.6.25-rc5-git3
- linux-2.6-ppc32-ucmpdi2.patch: nuked, merged upstream



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

iD8DBQBH2NV2yGugalF9Dw4RAijjAJ9zoHYHYdjLy1jPFZRmnN8AV4Ls2ACffCCK
eKj2VWvIbhOeEI4m2vCpafg=
=vgJv
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.780
retrieving revision 1.781
diff -u -r1.780 -r1.781
--- .cvsignore	12 Mar 2008 00:03:48 -0000	1.780
+++ .cvsignore	13 Mar 2008 15:24:16 -0000	1.781
@@ -5,5 +5,4 @@
 kernel-2.6.24
 linux-2.6.24.tar.bz2
 patch-2.6.25-rc5.bz2
-patch-2.6.25-rc4-git3.bz2
-patch-2.6.25-rc5-git2.bz2
+patch-2.6.25-rc5-git3.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.500
retrieving revision 1.501
diff -u -r1.500 -r1.501
--- kernel.spec	12 Mar 2008 21:48:36 -0000	1.500
+++ kernel.spec	13 Mar 2008 15:24:16 -0000	1.501
@@ -45,7 +45,7 @@
 # The rc snapshot level
 %define rcrev 5
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -623,7 +623,6 @@
 
 # nouveau + drm fixes
 Patch1801: linux-2.6-drm-git-mm.patch
-Patch1802: linux-2.6-ppc32-ucmpdi2.patch
 Patch1803: nouveau-drm.patch
 Patch1804: linux-2.6-drm-git-mm-revert-nopfn.patch
 Patch1805: linux-2.6-drm-git-i915-remove-priv-access.patch
@@ -1112,7 +1111,7 @@
 ApplyPatch linux-2.6-ata-quirk.patch
 
 # wireless patches headed for 2.6.25
-ApplyPatch linux-2.6-wireless.patch
+#ApplyPatch linux-2.6-wireless.patch
 # wireless patches headed for 2.6.26
 ApplyPatch linux-2.6-wireless-pending.patch
 ApplyPatch linux-2.6-wireless-fixups.patch
@@ -1146,7 +1145,6 @@
 
 # Nouveau DRM + drm fixes
 ApplyPatch linux-2.6-drm-git-mm.patch
-ApplyPatch linux-2.6-ppc32-ucmpdi2.patch
 ApplyPatch nouveau-drm.patch
 ApplyPatch linux-2.6-drm-git-mm-revert-nopfn.patch
 ApplyPatch linux-2.6-drm-git-i915-remove-priv-access.patch
@@ -1754,6 +1752,10 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Thu Mar 13 2008 Kyle McMartin <kmcmartin at redhat.com>
+- Linux 2.6.25-rc5-git3
+- linux-2.6-ppc32-ucmpdi2.patch: nuked, merged upstream
+
 * Wed Mar 12 2008 Jarod Wilson <jwilson at redhat.com>
 - firewire: fix DMA coherency on x86_64 systems w/memory
   mapped over the 4GB boundary (may fix #434830)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.740
retrieving revision 1.741
diff -u -r1.740 -r1.741
--- sources	12 Mar 2008 00:03:48 -0000	1.740
+++ sources	13 Mar 2008 15:24:16 -0000	1.741
@@ -1,3 +1,3 @@
 3f23ad4b69d0a552042d1ed0f4399857  linux-2.6.24.tar.bz2
 6f5fbe9f3655e53c561c4fea9bf2f525  patch-2.6.25-rc5.bz2
-c6d67eed3a378d720642c90b2a3a6c43  patch-2.6.25-rc5-git2.bz2
+5af278592c05ac90236cbbaa429d7a44  patch-2.6.25-rc5-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.662
retrieving revision 1.663
diff -u -r1.662 -r1.663
--- upstream	12 Mar 2008 00:03:48 -0000	1.662
+++ upstream	13 Mar 2008 15:24:16 -0000	1.663
@@ -1,3 +1,3 @@
 linux-2.6.24.tar.bz2
 patch-2.6.25-rc5.bz2
-patch-2.6.25-rc5-git2.bz2
+patch-2.6.25-rc5-git3.bz2


--- linux-2.6-ppc32-ucmpdi2.patch DELETED ---


--- patch-2.6.25-rc5-git2.bz2.sign DELETED ---