diff --git a/[refs] b/[refs]
index 13b8161c2bd5..5ab926b8ba8d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fab877900030ba3ae11928efb6087589f1e514c
+refs/heads/master: c9617a44b39d75b2098283d56355d02d4d5bee8b
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index d7b926abe91f..69c5ccce55e7 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -1072,7 +1072,6 @@ config UIDGID_CONVERTED
 
 	# Filesystems
 	depends on CIFS = n
-	depends on NFSD = n
 	depends on XFS_FS = n
 
 config UIDGID_STRICT_TYPE_CHECKS