From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Tue, 30 Sep 2014 21:22:02 +0000 (-0400)
Subject: Merge branch 'client-4.2' into linux-next
X-Git-Tag: v5.15~17016^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b4b56796fe635484d049960ee06a6d435634ab16;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'client-4.2' into linux-next

Merge NFSv4.2 client SEEK implementation from Anna

* client-4.2: (55 commits)
  NFS: Implement SEEK
  NFSD: Implement SEEK
  NFSD: Add generic v4.2 infrastructure
  svcrdma: advertise the correct max payload
  nfsd: introduce nfsd4_callback_ops
  nfsd: split nfsd4_callback initialization and use
  nfsd: introduce a generic nfsd4_cb
  nfsd: remove nfsd4_callback.cb_op
  nfsd: do not clear rpc_resp in nfsd4_cb_done_sequence
  nfsd: fix nfsd4_cb_recall_done error handling
  nfsd4: clarify how grace period ends
  nfsd4: stop grace_time update at end of grace period
  nfsd: skip subsequent UMH "create" operations after the first one for v4.0 clients
  nfsd: set and test NFSD4_CLIENT_STABLE bit to reduce nfsdcltrack upcalls
  nfsd: serialize nfsdcltrack upcalls for a particular client
  nfsd: pass extra info in env vars to upcalls to allow for early grace period end
  nfsd: add a v4_end_grace file to /proc/fs/nfsd
  lockd: add a /proc/fs/lockd/nlm_end_grace file
  nfsd: reject reclaim request when client has already sent RECLAIM_COMPLETE
  nfsd: remove redundant boot_time parm from grace_done client tracking op
  ...
---

b4b56796fe635484d049960ee06a6d435634ab16