From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 May 2016 21:39:20 +0000 (-0700)
Subject: Merge tag 'nfsd-4.7' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v4.14-rc1~3153
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5d22c5ab85e4de3c14d9e79eefc2835f4a8f9b2a;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'nfsd-4.7' of git://linux-nfs.org/~bfields/linux

Pull nfsd updates from Bruce Fields:
 "A very quiet cycle for nfsd, mainly just an RDMA update from Chuck
  Lever"

* tag 'nfsd-4.7' of git://linux-nfs.org/~bfields/linux:
  sunrpc: fix stripping of padded MIC tokens
  svcrpc: autoload rdma module
  svcrdma: Generalize svc_rdma_xdr_decode_req()
  svcrdma: Eliminate code duplication in svc_rdma_recvfrom()
  svcrdma: Drain QP before freeing svcrdma_xprt
  svcrdma: Post Receives only for forward channel requests
  svcrdma: Remove superfluous line from rdma_read_chunks()
  svcrdma: svc_rdma_put_context() is invoked twice in Send error path
  svcrdma: Do not add XDR padding to xdr_buf page vector
  svcrdma: Support IPv6 with NFS/RDMA
  nfsd: handle seqid wraparound in nfsd4_preprocess_layout_stateid
  Remove unnecessary allocation
---

5d22c5ab85e4de3c14d9e79eefc2835f4a8f9b2a