| commit | 147f1404db3ed0c3019002eef693c5d297b8f161 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 21 14:20:38 2014 -1000 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 21 14:20:38 2014 -1000 |
| tree | 7349fe8111e2ba8ee7a9aba69ec8893a69d8a573 | |
| parent | 401c58fcbbf570e7e4a8ee0e21ffd829deb4de0b [diff] | |
| parent | f41c5ad2ff2657978a9712b9ea80cd812a7da2b0 [diff] |
Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux Pull nfsd bugfixes from Bruce Fields: "Fixes for a new regression from the xdr encoding rewrite, and a delegation problem we've had for a while (made somewhat more annoying by the vfs delegation support added in 3.13)" * 'for-3.16' of git://linux-nfs.org/~bfields/linux: NFSD: fix bug for readdir of pseudofs NFSD: Don't hand out delegations for 30 seconds after recalling them.