rpms/kernel/devel patch-2.6.21-rc7-git4.bz2.sign, NONE, 1.1 .cvsignore, 1.609, 1.610 kernel-2.6.spec, 1.3101, 1.3102 sources, 1.572, 1.573 upstream, 1.500, 1.501 linux-2.6-e1000-revert-04.patch, 1.1, NONE linux-2.6-libata-pata_sis-oops.patch, 1.1, NONE patch-2.6.21-rc7-git3.bz2.sign, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Apr 20 17:29:31 UTC 2007 

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4351

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.21-rc7-git4.bz2.sign 
Removed Files:
	linux-2.6-e1000-revert-04.patch 
	linux-2.6-libata-pata_sis-oops.patch 
	patch-2.6.21-rc7-git3.bz2.sign 
Log Message:
* Fri Apr 20 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc7-git4



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

iD8DBQBGKG8NyGugalF9Dw4RAv2UAKCI0TyeWiwZi7QWNRGlgXaxrmvjSwCeNJZ1
vH4waAqmCDiEuxKSRLWWQ/o=
=fR/8
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.609
retrieving revision 1.610
diff -u -r1.609 -r1.610
--- .cvsignore	19 Apr 2007 23:23:15 -0000	1.609
+++ .cvsignore	20 Apr 2007 17:29:29 -0000	1.610
@@ -5,4 +5,4 @@
 kernel-2.6.20
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc7.bz2
-patch-2.6.21-rc7-git3.bz2
+patch-2.6.21-rc7-git4.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3101
retrieving revision 1.3102
diff -u -r1.3101 -r1.3102
--- kernel-2.6.spec	20 Apr 2007 05:11:34 -0000	1.3101
+++ kernel-2.6.spec	20 Apr 2007 17:29:29 -0000	1.3102
@@ -371,7 +371,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.21-rc7.bz2
-Patch2: patch-2.6.21-rc7-git3.bz2
+Patch2: patch-2.6.21-rc7-git4.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -525,7 +525,6 @@
 Patch1300: linux-2.6-e1000-revert-01.patch
 Patch1301: linux-2.6-e1000-revert-02.patch
 Patch1302: linux-2.6-e1000-revert-03.patch
-Patch1303: linux-2.6-e1000-revert-04.patch
 Patch1304: linux-2.6-e1000-revert-05.patch
 Patch1305: linux-2.6-e1000-revert-06.patch
 Patch1306: linux-2.6-e1000-revert-07.patch
@@ -587,7 +586,6 @@
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
 Patch2201: linux-2.6-libata-hpa.patch
 Patch2202: linux-2.6-libata-sata_nv-adma.patch
-Patch2203: linux-2.6-libata-pata_sis-oops.patch
 Patch2204: linux-2.6-ata-quirk.patch
 Patch2205: linux-2.6-libata-debug.patch
 
@@ -1224,20 +1222,19 @@
 
 # NIC driver fixes
 # revert e1000 to 2.6.20
-%patch1314 -p1 -R
-%patch1313 -p1 -R
-%patch1312 -p1 -R
-%patch1311 -p1 -R
-%patch1310 -p1 -R
-%patch1309 -p1 -R
-%patch1307 -p1 -R
-%patch1306 -p1 -R
-%patch1305 -p1 -R
-%patch1304 -p1 -R
-%patch1303 -p1 -R
-%patch1302 -p1 -R
-%patch1301 -p1 -R
-%patch1300 -p1 -R
+#%patch1314 -p1 -R
+#%patch1313 -p1 -R
+#%patch1312 -p1 -R
+#%patch1311 -p1 -R
+#%patch1310 -p1 -R
+#%patch1309 -p1 -R
+#%patch1307 -p1 -R
+#%patch1306 -p1 -R
+#%patch1305 -p1 -R
+#%patch1304 -p1 -R
+#%patch1302 -p1 -R
+#%patch1301 -p1 -R
+#%patch1300 -p1 -R
 
 # Filesystem patches.
 # Squashfs
@@ -1322,8 +1319,6 @@
 %patch2201 -p1
 # sata_nv: Don't attempt using ADMA for (READ|SET)_MAX commands
 %patch2202 -p1
-# fix oops in pata_sis
-%patch2203 -p1
 # libata: don't initialize sg in ata_exec_internal() if DMA_NONE
 # ia64 ata quirk
 %patch2204 -p1
@@ -2330,6 +2325,9 @@
 
 %changelog
 * Fri Apr 20 2007 Dave Jones <davej at redhat.com>
+- 2.6.21-rc7-git4
+
+* Fri Apr 20 2007 Dave Jones <davej at redhat.com>
 - Drop broken sata debug patch.
 
 * Thu Apr 19 2007 Dave Jones <davej at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.572
retrieving revision 1.573
diff -u -r1.572 -r1.573
--- sources	19 Apr 2007 23:23:15 -0000	1.572
+++ sources	20 Apr 2007 17:29:29 -0000	1.573
@@ -1,4 +1,4 @@
 2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 3a54bf5a7cf6b124e680e1d08fe1b20b  patch-2.6.21-rc7.bz2
-7a604f926086e4abb18a09219010ee40  patch-2.6.21-rc7-git3.bz2
+8a967ac2d7c74ddbbd24c106d9d2518b  patch-2.6.21-rc7-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.500
retrieving revision 1.501
diff -u -r1.500 -r1.501
--- upstream	19 Apr 2007 23:23:15 -0000	1.500
+++ upstream	20 Apr 2007 17:29:29 -0000	1.501
@@ -1,3 +1,3 @@
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc7.bz2
-patch-2.6.21-rc7-git3.bz2
+patch-2.6.21-rc7-git4.bz2


--- linux-2.6-e1000-revert-04.patch DELETED ---


--- linux-2.6-libata-pata_sis-oops.patch DELETED ---


--- patch-2.6.21-rc7-git3.bz2.sign DELETED ---

More information about the fedora-cvs-commits mailing list