| commit | 1113cdfe7d2c1fe08b64caa3affe19260e66dd95 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 19 11:20:48 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 19 11:20:48 2015 -0700 |
| tree | 6f14a78a5a991756bf0b9d538caff197d55de895 | |
| parent | 416716ed390782e373875f39b39ee23c91902688 [diff] | |
| parent | feaff8e5b2cfc3eae02cf65db7a400b0b9ffc596 [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