From: Linus Torvalds Date: Thu, 9 May 2013 17:24:54 +0000 (-0700) Subject: Merge tag 'nfs-for-3.10-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs X-Git-Tag: accepted/tizen/common/20141203.182822~2278 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8cbc95ee748741939222c3d38584a40c92bedcdd;p=platform%2Fkernel%2Flinux-arm64.git Merge tag 'nfs-for-3.10-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs Pull more NFS client bugfixes from Trond Myklebust: - Ensure that we match the 'sec=' mount flavour against the server list - Fix the NFSv4 byte range locking in the presence of delegations - Ensure that we conform to the NFSv4.1 spec w.r.t. freeing lock stateids - Fix a pNFS data server connection race * tag 'nfs-for-3.10-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: NFS4.1 Fix data server connection race NFSv3: match sec= flavor against server list NFSv4.1: Ensure that we free the lock stateid on the server NFSv4: Convert nfs41_free_stateid to use an asynchronous RPC call SUNRPC: Don't spam syslog with "Pseudoflavor not found" messages NFSv4.x: Fix handling of partially delegated locks --- 8cbc95ee748741939222c3d38584a40c92bedcdd