Merge tag 'nfs-for-3.19-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Jan 2015 23:18:12 +0000 (15:18 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Jan 2015 23:18:12 +0000 (15:18 -0800)
commit353a0c6fcc957939c58cadbd342870445f996a7a
treeeca68c3825feeaa7da5aa2710e3feb922e4cc047
parent884e00f37d8b8464de6b1a5ee456957e530d6d8a
parent2ef47eb1aee171ecf1d83311b9f7fae80f330181
Merge tag 'nfs-for-3.19-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

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

   - Stable fix for a NFSv4.1 Oops on mount
   - Stable fix for an O_DIRECT deadlock condition
   - Fix an issue with submounted volumes and fake duplicate inode
     numbers"

* tag 'nfs-for-3.19-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFS: Fix use of nfs_attr_use_mounted_on_fileid()
  NFSv4.1: Fix an Oops in nfs41_walk_client_list
  nfs: fix dio deadlock when O_DIRECT flag is flipped