| commit | 0d122f7430ed4c4298e33e0d70dc4065679720a2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Mar 21 10:41:15 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Mar 21 10:41:15 2015 -0700 |
| tree | 3ca52bed36b724e2b66cbf4775dd4ea1cce75dd3 | |
| parent | c6ef814509fedb4ab4b5dc5bdca309d4e7181597 [diff] | |
| parent | 133d558216d9db3617a9fdeebd1bce9afff5f973 [diff] |
Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux Pull nfsd bufix from Bruce Fields: "This is a fix for a crash easily triggered by 4.1 activity to a server built with CONFIG_NFSD_PNFS. There are some more bugfixes queued up that I intend to pass along next week, but this is the most critical" * 'for-4.0' of git://linux-nfs.org/~bfields/linux: Subject: nfsd: don't recursively call nfsd4_cb_layout_fail