rpms/kernel/F-10 patch-2.6.29-rc8-git4.bz2.sign, NONE, 1.1 .cvsignore, 1.998, 1.999 config-generic, 1.218, 1.219 config-powerpc-generic, 1.30, 1.31 kernel.spec, 1.1292, 1.1293 sources, 1.959, 1.960 upstream, 1.870, 1.871 linux-2.6-ext4-extent-header-check-fix.patch, 1.1, NONE linux-2.6-ext4-print-warning-once.patch, 1.1, NONE

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	.cvsignore config-generic config-powerpc-generic kernel.spec 
	sources upstream 
Added Files:
	patch-2.6.29-rc8-git4.bz2.sign 
Removed Files:
	linux-2.6-ext4-extent-header-check-fix.patch 
	linux-2.6-ext4-print-warning-once.patch 
Log Message:
2.6.29-rc8-git4
Dropped patches, merged upstream:
    linux-2.6-ext4-extent-header-check-fix.patch
    linux-2.6-ext4-print-warning-once.patch
Enable SFC network driver.


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

iD8DBQBJwb+qyGugalF9Dw4RAr/+AKCLD35JubO7loNvbJr61s0LmyluiQCfUN7/
J76O0zE2Ggh87jgFdz57rkE=
=rLF6
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.998
retrieving revision 1.999
diff -u -r1.998 -r1.999
--- .cvsignore	13 Mar 2009 05:23:55 -0000	1.998
+++ .cvsignore	19 Mar 2009 04:46:40 -0000	1.999
@@ -6,3 +6,4 @@
 kernel-2.6.28
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc8.bz2
+patch-2.6.29-rc8-git4.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-generic,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- config-generic	12 Mar 2009 00:46:12 -0000	1.218
+++ config-generic	19 Mar 2009 04:46:41 -0000	1.219
@@ -1161,6 +1161,7 @@
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_VORTEX=m
 CONFIG_TYPHOON=m
+CONFIG_DNET=m
 
 #
 # Tulip family network device support
@@ -1248,7 +1249,6 @@
 CONFIG_R8169=m
 CONFIG_R8169_NAPI=y
 CONFIG_R8169_VLAN=y
-# CONFIG_SFC is not set
 # CONFIG_SK98LIN is not set
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
@@ -1281,6 +1281,9 @@
 CONFIG_MLX4_EN=m
 # CONFIG_MLX4_DEBUG is not set
 CONFIG_QLGE=m
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_BE2NET=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-powerpc-generic,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- config-powerpc-generic	4 Mar 2009 06:53:39 -0000	1.30
+++ config-powerpc-generic	19 Mar 2009 04:46:41 -0000	1.31
@@ -289,7 +289,7 @@
 
 CONFIG_SIMPLE_GPIO=y
 
-CONFIG_MTD_PS3VRAM=m
+CONFIG_PS3_VRAM=m
 CONFIG_MDIO_GPIO=m
 CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL=m
 # CONFIG_DEBUG_GPIO is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1292
retrieving revision 1.1293
diff -u -r1.1292 -r1.1293
--- kernel.spec	16 Mar 2009 12:02:23 -0000	1.1292
+++ kernel.spec	19 Mar 2009 04:46:41 -0000	1.1293
@@ -57,7 +57,7 @@
 # The rc snapshot level
 %define rcrev 8
 # The git snapshot level
-%define gitrev 0
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -657,9 +657,6 @@
 # silence the ACPI blacklist code
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
 
-Patch2900: linux-2.6-ext4-extent-header-check-fix.patch
-Patch2902: linux-2.6-ext4-print-warning-once.patch
-
 Patch2911: linux-2.6-ext4-flush-on-close.patch
 
 Patch9001: revert-fix-modules_install-via-nfs.patch
@@ -1081,9 +1078,6 @@
 #
 
 # ext4
-ApplyPatch linux-2.6-ext4-extent-header-check-fix.patch
-ApplyPatch linux-2.6-ext4-print-warning-once.patch
-
 # data integrity band-aid for badly written apps
 ApplyPatch linux-2.6-ext4-flush-on-close.patch
 
@@ -1770,6 +1764,13 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Mar 19 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.63.rc8.git4
+- 2.6.29-rc8-git4
+- Dropped patches, merged upstream:
+    linux-2.6-ext4-extent-header-check-fix.patch
+    linux-2.6-ext4-print-warning-once.patch
+- Enable SFC network driver.
+
 * Mon Mar 16 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.62.rc8
 - Build VIA Padlock driver on PAE kernels.
 - Padlock cannot be built for x86_64.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.959
retrieving revision 1.960
diff -u -r1.959 -r1.960
--- sources	13 Mar 2009 05:23:55 -0000	1.959
+++ sources	19 Mar 2009 04:46:42 -0000	1.960
@@ -1,2 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 0a86c29a637967fddeb1ba2ed8b33e59  patch-2.6.29-rc8.bz2
+62aec57311357c6e24afb2702f33d1ba  patch-2.6.29-rc8-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.870
retrieving revision 1.871
diff -u -r1.870 -r1.871
--- upstream	13 Mar 2009 05:23:56 -0000	1.870
+++ upstream	19 Mar 2009 04:46:42 -0000	1.871
@@ -1,2 +1,3 @@
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc8.bz2
+patch-2.6.29-rc8-git4.bz2


--- linux-2.6-ext4-extent-header-check-fix.patch DELETED ---


--- linux-2.6-ext4-print-warning-once.patch DELETED ---