From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 19 May 2015 18:20:48 +0000 (-0700)
Subject: Merge tag 'nfs-for-4.1-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: firefly_0821_release~176^2~1753
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1113cdfe7d2c1fe08b64caa3affe19260e66dd95;p=firefly-linux-kernel-4.4.55.git

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
---

1113cdfe7d2c1fe08b64caa3affe19260e66dd95