rpms/kernel/F-10 config-generic, 1.217, 1.218 kernel.spec, 1.1286, 1.1287 linux-2.6.28-lockd-svc-register.patch, 1.1, NONE linux-2.6.28-sunrpc-ipv6-rpcbind.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-serv15257

Modified Files:
	config-generic kernel.spec 
Removed Files:
	linux-2.6.28-lockd-svc-register.patch 
	linux-2.6.28-sunrpc-ipv6-rpcbind.patch 
Log Message:
Drop sunrpc-over-ipv6 patches and disable CONFIG_SUNRPC_REGISTER_V4


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-generic,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- config-generic	1 Mar 2009 02:52:36 -0000	1.217
+++ config-generic	12 Mar 2009 00:46:12 -0000	1.218
@@ -3145,7 +3145,7 @@
 CONFIG_SUNRPC_BIND34=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_SUNRPC_REGISTER_V4=y
+# CONFIG_SUNRPC_REGISTER_V4 is not set
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_RPCSEC_GSS_SPKM3=m
 # CONFIG_SMB_FS is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1286
retrieving revision 1.1287
diff -u -r1.1286 -r1.1287
--- kernel.spec	12 Mar 2009 00:29:04 -0000	1.1286
+++ kernel.spec	12 Mar 2009 00:46:14 -0000	1.1287
@@ -653,9 +653,6 @@
 Patch2200: linux-2.6-firewire-git-update.patch
 Patch2201: linux-2.6-firewire-git-pending.patch
 
-Patch2300: linux-2.6.28-sunrpc-ipv6-rpcbind.patch
-Patch2301: linux-2.6.28-lockd-svc-register.patch
-
 # Quiet boot fixes
 # silence the ACPI blacklist code
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
@@ -1181,10 +1178,6 @@
 ApplyPatch linux-2.6-firewire-git-pending.patch
 fi
 
-# Fix NFS
-ApplyPatch linux-2.6.28-sunrpc-ipv6-rpcbind.patch
-ApplyPatch linux-2.6.28-lockd-svc-register.patch
-
 # silence the ACPI blacklist code
 ApplyPatch linux-2.6-silence-acpi-blacklist.patch
 
@@ -1767,6 +1760,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Mar 11 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.57.rc7.git5
+- Drop sunrpc-over-ipv6 patches and disable CONFIG_SUNRPC_REGISTER_V4
+
 * Wed Mar 11 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.56.rc7.git5
 - 2.6.29-rc7-git5
 


--- linux-2.6.28-lockd-svc-register.patch DELETED ---


--- linux-2.6.28-sunrpc-ipv6-rpcbind.patch DELETED ---