Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752144AbaDXGZT (ORCPT ); Thu, 24 Apr 2014 02:25:19 -0400 Received: from fieldses.org ([174.143.236.118]:51580 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751474AbaDXGZR (ORCPT ); Thu, 24 Apr 2014 02:25:17 -0400 Date: Thu, 24 Apr 2014 02:25:16 -0400 To: Linus Torvalds Cc: linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, jlayton@redhat.com Subject: nfsd bug fixes for 3.15 Message-ID: <20140424062516.GA8891@fieldses.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) From: "J. Bruce Fields" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/