rpms/kernel/devel patch-2.6.29-rc8-git4.bz2.sign, NONE, 1.1 .cvsignore, 1.1035, 1.1036 config-generic, 1.257, 1.258 config-powerpc-generic, 1.36, 1.37 kernel.spec, 1.1443, 1.1444 sources, 1.997, 1.998 upstream, 1.908, 1.909 linux-2.6-ext4-extent-header-check-fix.patch, 1.1, NONE linux-2.6-ext4-print-warning-once.patch, 1.1, NONE linux-2.6-net-velocity-dma.patch, 1.1, NONE patch-2.6.29-rc8-git2.bz2.sign, 1.1, NONE

[Chuck Ebbert]

Author: cebbert

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

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 
	linux-2.6-net-velocity-dma.patch 
	patch-2.6.29-rc8-git2.bz2.sign 
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
    linux-2.6-net-velocity-dma.patch


--- 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/devel/.cvsignore,v
retrieving revision 1.1035
retrieving revision 1.1036
diff -u -r1.1035 -r1.1036
--- .cvsignore	16 Mar 2009 13:59:23 -0000	1.1035
+++ .cvsignore	19 Mar 2009 05:20:03 -0000	1.1036
@@ -6,4 +6,4 @@
 kernel-2.6.28
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc8.bz2
-patch-2.6.29-rc8-git2.bz2
+patch-2.6.29-rc8-git4.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- config-generic	13 Mar 2009 14:49:31 -0000	1.257
+++ config-generic	19 Mar 2009 05:20:03 -0000	1.258
@@ -1162,6 +1162,7 @@
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_VORTEX=m
 CONFIG_TYPHOON=m
+CONFIG_DNET=m
 
 #
 # Tulip family network device support
@@ -1249,7 +1250,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
@@ -1282,6 +1282,8 @@
 CONFIG_MLX4_EN=m
 # CONFIG_MLX4_DEBUG is not set
 CONFIG_QLGE=m
+# CONFIG_SFC is not set
+CONFIG_BE2NET=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- config-powerpc-generic	4 Mar 2009 00:09:55 -0000	1.36
+++ config-powerpc-generic	19 Mar 2009 05:20:03 -0000	1.37
@@ -291,7 +291,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/devel/kernel.spec,v
retrieving revision 1.1443
retrieving revision 1.1444
diff -u -r1.1443 -r1.1444
--- kernel.spec	19 Mar 2009 01:55:32 -0000	1.1443
+++ kernel.spec	19 Mar 2009 05:20:04 -0000	1.1444
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 8
 # The git snapshot level
-%define gitrev 2
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -666,8 +666,6 @@
 
 # Fix DEBUG_SHIRQ problem in tulip driver.  (454575)
 Patch2001: linux-2.6-net-tulip-interrupt.patch
-# Fix DMA alloc bug in velocity
-Patch2002: linux-2.6-net-velocity-dma.patch
 
 # linux1394 git patches
 Patch2200: linux-2.6-firewire-git-update.patch
@@ -682,8 +680,6 @@
 Patch2901: linux-2.6-v4l-dvb-experimental.patch
 
 # fs fixes
-Patch2910: linux-2.6-ext4-extent-header-check-fix.patch
-Patch2911: linux-2.6-ext4-print-warning-once.patch
 Patch2920: linux-2.6-ext4-flush-on-close.patch
 Patch3000: linux-2.6-btrfs-experimental-branch.patch
 
@@ -1103,9 +1099,6 @@
 #
 
 # ext4
-ApplyPatch linux-2.6-ext4-extent-header-check-fix.patch
-ApplyPatch linux-2.6-ext4-print-warning-once.patch
-
 ApplyPatch linux-2.6-ext4-flush-on-close.patch
 
 # xfs
@@ -1202,7 +1195,6 @@
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
-ApplyPatch linux-2.6-net-velocity-dma.patch
 
 ApplyPatch agp-set_memory_ucwb.patch
 # Nouveau DRM + drm fixes
@@ -1818,6 +1810,13 @@
 # and build.
 
 %changelog
+* Thu Mar 19 2009 Chuck Ebbert <cebbert at redhat.com>
+- 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
+    linux-2.6-net-velocity-dma.patch
+
 * Wed Mar 18 2009 Mauro Carvalho Chehab <mchehab at redhat.com>
 - merge hdpvr patch into v4l-dvb updates
 - update v4l-dvb to reflect changes at linux-next


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.997
retrieving revision 1.998
diff -u -r1.997 -r1.998
--- sources	16 Mar 2009 13:59:23 -0000	1.997
+++ sources	19 Mar 2009 05:20:05 -0000	1.998
@@ -1,3 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 0a86c29a637967fddeb1ba2ed8b33e59  patch-2.6.29-rc8.bz2
-682f205222f03b1a903fc437f9788cfa  patch-2.6.29-rc8-git2.bz2
+62aec57311357c6e24afb2702f33d1ba  patch-2.6.29-rc8-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.908
retrieving revision 1.909
diff -u -r1.908 -r1.909
--- upstream	16 Mar 2009 13:59:23 -0000	1.908
+++ upstream	19 Mar 2009 05:20:05 -0000	1.909
@@ -1,4 +1,3 @@
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc8.bz2
-patch-2.6.29-rc8-git2.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 ---


--- linux-2.6-net-velocity-dma.patch DELETED ---


--- patch-2.6.29-rc8-git2.bz2.sign DELETED ---