From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Apr 2014 21:14:57 +0000 (-0700)
Subject: Merge tag 'for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh... 
X-Git-Tag: v3.15-rc1~24
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=582076ab16779208e7eb6ce712a9c0a6cc5bafe4;p=linux-2.6-block.git

Merge tag 'for-linus-3.15' of git://git./linux/kernel/git/ericvh/v9fs

Pull 9p changes from Eric Van Hensbergen:
 "A bunch of updates and cleanup within the transport layer,
  particularly with a focus on RDMA"

* tag 'for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9pnet_rdma: check token type before int conversion
  9pnet: trans_fd : allocate struct p9_trans_fd and struct p9_conn together.
  9pnet: p9_client->conn field is unused. Remove it.
  9P: Get rid of REQ_STATUS_FLSH
  9pnet_rdma: add cancelled()
  9pnet_rdma: update request status during send
  9P: Add cancelled() to the transport functions.
  net: Mark function as static in 9p/client.c
  9P: Add memory barriers to protect request fields over cb/rpc threads handoff
---

582076ab16779208e7eb6ce712a9c0a6cc5bafe4