[kernel] r17934 - in dists/trunk/linux-2.6/debian: . config

[Ben Hutchings]

Author: benh
Date: Mon Aug 15 14:31:57 2011
New Revision: 17934

Log:
nfs: Enable NFSv4.1/pNFS (Closes: #627655)

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon Aug 15 14:28:10 2011	(r17933)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Aug 15 14:31:57 2011	(r17934)
@@ -16,6 +16,7 @@
     - pata_macio replaces ide_pmac
   * aufs: Disable until it is updated for Linux 3.1
   * rt: Disable until it is updated for Linux 3.1
+  * nfs: Enable NFSv4.1/pNFS (Closes: #627655)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 27 Jul 2011 23:58:10 +0200
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Mon Aug 15 14:28:10 2011	(r17933)
+++ dists/trunk/linux-2.6/debian/config/config	Mon Aug 15 14:31:57 2011	(r17934)
@@ -3277,7 +3277,7 @@
 CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
+CONFIG_NFS_V4_1=y
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 # CONFIG_NFS_USE_NEW_IDMAPPER is not set