rpms/kernel/devel kernel-2.6.spec, 1.2683, 1.2684 linux-2.6-NFSD-non-null-getxattr.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-NFSD-non-null-getxattr.patch 
Log Message:
kill old NFS cruft


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2683
retrieving revision 1.2684
diff -u -r1.2683 -r1.2684
--- kernel-2.6.spec	20 Sep 2006 18:34:44 -0000	1.2683
+++ kernel-2.6.spec	20 Sep 2006 19:19:14 -0000	1.2684
@@ -412,9 +412,8 @@
 Patch1106: linux-2.6-aic9400-adp94xx-updates.patch
 
 # NFS bits.
-Patch1200: linux-2.6-NFSD-non-null-getxattr.patch
-Patch1201: linux-2.6-NFSD-ctlbits.patch
-Patch1203: linux-2.6-NFSD-badness.patch
+Patch1200: linux-2.6-NFSD-ctlbits.patch
+Patch1201: linux-2.6-NFSD-badness.patch
 
 # core networking changes.
 Patch1300: linux-2.6-net-ipsec-labelling.patch
@@ -966,13 +965,12 @@
 %patch1106 -p1
 
 #
-# Various upstream NFS/NFSD fixes.
+# Various NFS/NFSD fixes.
 #
-#%patch1200 -p1
 # kNFSD: fixed '-p port' arg to rpc.nfsd and enables the defining proto versions and transports
-%patch1201 -p1
+%patch1200 -p1
 # Fix badness.
-%patch1203 -p1
+%patch1201 -p1
 
 # core networking changes.
 %patch1300 -p1


--- linux-2.6-NFSD-non-null-getxattr.patch DELETED ---