From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Jan 2015 18:59:06 +0000 (+1300)
Subject: Merge tag 'nfs-for-3.19-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a2a32cd1d7c3085da129ab6e2060f6afae187176;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'nfs-for-3.19-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

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

   - Stable fix for a NFSv3/lockd race
   - Fixes for several NFSv4.1 client id trunking bugs
   - Remove an incorrect test when checking for delegated opens"

* tag 'nfs-for-3.19-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFSv4: Remove incorrect check in can_open_delegated()
  NFS: Ignore transport protocol when detecting server trunking
  NFSv4/v4.1: Verify the client owner id during trunking detection
  NFSv4: Cache the NFSv4/v4.1 client owner_id in the struct nfs_client
  NFSv4.1: Fix client id trunking on Linux
  LOCKD: Fix a race when initialising nlmsvc_timeout
---

a2a32cd1d7c3085da129ab6e2060f6afae187176