diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-25 12:39:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-25 12:39:05 -0700 |
| commit | b8e6dece3746902c29a4f0007c062641fa5dcc2d (patch) | |
| tree | dcd5c7a70a04f89448cffd408a1743f90f41e7a6 /arch | |
| parent | 76429f1dedbc1815d875c9b68eefd30c95cb8fa9 (diff) | |
| parent | fc208d026be0c7d60db9118583fc62f6ca97743d (diff) | |
Merge branch 'for-3.15' of git://linux-nfs.org/~bfields/linux
Pull nfsd bugfixes from Bruce Fields:
"Three small nfsd bugfixes (including one locks.c fix for a bug
triggered only from nfsd).
Jeff's patches are for long-existing problems that became easier to
trigger since the addition of vfs delegation support"
* 'for-3.15' of git://linux-nfs.org/~bfields/linux:
Revert "nfsd4: fix nfs4err_resource in 4.1 case"
nfsd: set timeparms.to_maxval in setup_callback_client
locks: allow __break_lease to sleep even when break_time is 0
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions