From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 5 Aug 2015 08:59:59 +0000 (+0200)
Subject: Merge branch 'for-4.2' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: omap-for-v4.3/fixes-merge-window~138
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e91edcd1b8b7f12c6484a0b17fb45774354e0b6;p=pandora-kernel.git

Merge branch 'for-4.2' of git://linux-nfs.org/~bfields/linux

Pull nfsd fixes from Bruce Fields.

* 'for-4.2' of git://linux-nfs.org/~bfields/linux:
  nfsd: do nfs4_check_fh in nfs4_check_file instead of nfs4_check_olstateid
  nfsd: Fix a file leak on nfsd4_layout_setlease failure
  nfsd: Drop BUG_ON and ignore SECLABEL on absent filesystem
---

9e91edcd1b8b7f12c6484a0b17fb45774354e0b6
Reading git-diff-tree failed