]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge tag 'nfs-for-3.19-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jan 2015 18:59:06 +0000 (07:59 +1300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jan 2015 18:59:06 +0000 (07:59 +1300)
commita2a32cd1d7c3085da129ab6e2060f6afae187176
tree05ca46cf9b32d4dd560b7b2836b8d65ce953cca0
parent23aa4b416afdf37869e53c188944dd7c4c47949a
parent4e379d36c050b0117b5d10048be63a44f5036115
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