Merge branch 'for-2.6.40' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.40' of git://linux-nfs.org/~bfields/linux:
  nfsd4: fix break_lease flags on nfsd open
  nfsd: link returns nfserr_delay when breaking lease
  nfsd: v4 support requires CRYPTO
  nfsd: fix dependency of nfsd on auth_rpcgss
This commit is contained in:
Linus Torvalds
2011-06-20 20:10:52 -07:00
5 changed files with 25 additions and 21 deletions
+4
View File
@@ -0,0 +1,4 @@
/*
* Dumb way to share this static piece of information with nfsd
*/
#define KRB5_SUPPORTED_ENCTYPES "18,17,16,23,3,1,2"