projects / linux / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 416716e feaff8e)
Merge tag 'nfs-for-4.1-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 May 2015 18:20:48 +0000 (11:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 May 2015 18:20:48 +0000 (11:20 -0700)
commit1113cdfe7d2c1fe08b64caa3affe19260e66dd95
tree6f14a78a5a991756bf0b9d538caff197d55de895tree | snapshot
parent416716ed390782e373875f39b39ee23c91902688commit | diff
parentfeaff8e5b2cfc3eae02cf65db7a400b0b9ffc596commit | diff
Merge tag 'nfs-for-4.1-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull two NFS client bugfixes from Trond Myklebust:
 "Highlights include:

   - fix a Linux-4.1 regression affecting stat()

   - take an extra reference to fl->fl_file when running a setlk"

* tag 'nfs-for-4.1-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  nfs: take extra reference to fl->fl_file when running a setlk
  nfs: stat(2) fails during cthon04 basic test5 on NFSv4.0
https://github.com/torvalds/linux.git