]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-4.2' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 Aug 2015 08:59:59 +0000 (10:59 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 Aug 2015 08:59:59 +0000 (10:59 +0200)
commit2245bdcbd880038df463cb7342e14918dfe57e37
tree1205268178891f72aaef7f06a6388f8b410efd02
parentcf91a3de76f8e0e468a67e21799ba47b8810c82c
parentad2600904388f05af0b65fc9b96402680b692506
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