Please pull the following bug fixes for 3.15 from: git://linux-nfs.org/~bfields/linux.git for-3.15 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. --b. ---------------------------------------------------------------- J. Bruce Fields (1): Revert "nfsd4: fix nfs4err_resource in 4.1 case" Jeff Layton (2): locks: allow __break_lease to sleep even when break_time is 0 nfsd: set timeparms.to_maxval in setup_callback_client fs/locks.c | 7 +++---- fs/nfsd/nfs4callback.c | 4 +++- fs/nfsd/nfs4xdr.c | 8 -------- 3 files changed, 6 insertions(+), 13 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html