From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Sep 2014 18:54:54 +0000 (-0700)
Subject: Merge tag 'nfs-for-3.17-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: v5.15~17248
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=602b5366292b5c04926c6042a400d1907413b010;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'nfs-for-3.17-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client fixes from Trond Myklebust:
 "Highlights:
   - fix a kernel warning when removing /proc/net/nfsfs
   - revert commit 49a4bda22e18 due to Oopses
   - fix a typo in the pNFS file layout commit code"

* tag 'nfs-for-3.17-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  pnfs: fix filelayout_retry_commit when idx > 0
  nfs: revert "nfs4: queue free_lock_state job submission to nfsiod"
  nfs: fix kernel warning when removing proc entry
---

602b5366292b5c04926c6042a400d1907413b010