From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Sep 2014 20:07:49 +0000 (-0700)
Subject: Merge tag 'nfs-for-3.17-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: v3.17-rc6~8
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=81770f41447bb2534d29b58a14ab501c0fb1e671;p=linux-2.6-block.git

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

Pull NFS client fixes from Trond Myklebust:
 "Highligts:
   - fix an Oops in nfs4_open_and_get_state
   - fix an Oops in the nfs4_state_manager
   - fix another bug in the close/open_downgrade code"

* tag 'nfs-for-3.17-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFSv4: Fix another bug in the close/open_downgrade code
  NFSv4: nfs4_state_manager() vs. nfs_server_remove_lists()
  NFS: remove BUG possibility in nfs4_open_and_get_state
---

81770f41447bb2534d29b58a14ab501c0fb1e671