From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Jul 2013 17:21:23 +0000 (-0700)
Subject: Merge tag 'for-linus-3.11-merge-window-part-2' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: MMI-PSA29.97-13-9~14023
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=19d2f8e0fb7bba99cc585d2467e9fa54a84c8557;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'for-linus-3.11-merge-window-part-2' of git://git./linux/kernel/git/ericvh/v9fs

Pull second round of 9p patches from Eric Van Hensbergen:
 "Several of these patches were rebased in order to correct style
  issues.  Only stylistic changes were made versus the patches which
  were in linux-next for two weeks.  The rebases have been in linux-next
  for 3 days and have passed my regressions.

  The bulk of these are RDMA fixes and improvements.  There's also some
  additions on the extended attributes front to support some additional
  namespaces and a new option for TCP to force allocation of mount
  requests from a priviledged port"

* tag 'for-linus-3.11-merge-window-part-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  fs/9p: Remove the unused variable "err" in v9fs_vfs_getattr()
  9P: Add cancelled() to the transport functions.
  9P/RDMA: count posted buffers without a pending request
  9P/RDMA: Improve error handling in rdma_request
  9P/RDMA: Do not free req->rc in error handling in rdma_request()
  9P/RDMA: Use a semaphore to protect the RQ
  9P/RDMA: Protect against duplicate replies
  9P/RDMA: increase P9_RDMA_MAXSIZE to 1MB
  9pnet: refactor struct p9_fcall alloc code
  9P/RDMA: rdma_request() needs not allocate req->rc
  9P: Fix fcall allocation for rdma
  fs/9p: xattr: add trusted and security namespaces
  net/9p: add privport option to 9p tcp transport
---

19d2f8e0fb7bba99cc585d2467e9fa54a84c8557