Merge branch 'topic/uek-4.1/nfs-rdma' of git://ca-git.us.oracle.com/linux-uek into...

* 'topic/uek-4.1/nfs-rdma' of git://ca-git.us.oracle.com/linux-uek: (71 commits)
  xprtrdma: Add class for RDMA backwards direction transport
  svcrdma: Add infrastructure to receive backwards direction RPC/RDMA replies
  svcrdma: Add infrastructure to send backwards direction RPC/RDMA calls
  svcrdma: Add svc_rdma_get_context() API that is allowed to fail
  svcrdma: Define maximum number of backchannel requests
  NFS: Enable client side NFSv4.1 backchannel to use other transports
  svcrdma: Add backward direction service for RPC/RDMA transport
  xprtrdma: Handle incoming backward direction RPC calls
  xprtrdma: Add support for sending backward direction RPC replies
  xprtrdma: Pre-allocate Work Requests for backchannel
  xprtrdma: Pre-allocate backward rpc_rqst and send/receive buffers
  SUNRPC: Abstract backchannel operations
  SUNRPC: xprt_complete_bc_request must also decrement the free slot count
  SUNRPC: Fix a backchannel deadlock
  SUNRPC: Fix a backchannel race
  SUNRPC: Clean up allocation and freeing of back channel requests
  xprtrdma: Replace send and receive arrays
  xprtrdma: Refactor reply handler error handling
  xprtrdma: Wait before destroying transport's queue pair
  xprtrdma: Remove completion polling budgets
  ...

diff --cc fs/nfs/nfs3xdr.c
Simple merge

diff --cc net/sunrpc/backchannel_rqst.c
Simple merge