Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', 'qib' and 'srp' into for-next - linux

diff options

author	Roland Dreier <roland@purestorage.com>	2013-11-17 17:22:19 +0100
committer	Roland Dreier <roland@purestorage.com>	2013-11-17 17:22:19 +0100
commit	b4fdf52b3fc8dd3ce13ece334f5fdff869705429 (patch)
tree	3cb3cf9b8fbee6a0ae79097cfd8197b90985bc02 /drivers/infiniband/hw/mlx5/qp.c
parent	RDMA/cma: Remove unused argument and minor dead code (diff)
parent	IB/cxgb4: Fix formatting of physical address (diff)
parent	IB/core: Re-enable create_flow/destroy_flow uverbs (diff)
parent	IPoIB: lower NAPI weight (diff)
parent	IB/ucma: Convert use of typedef ctl_table to struct ctl_table (diff)
parent	IB/mlx4: Fix endless loop in resize CQ (diff)
parent	IB/mlx5: Fix page shift in create CQ for userspace (diff)
parent	RDMA/nes: Remove self-assignment from nes_query_qp() (diff)
parent	RDMA/ocrdma: Remove redundant check in ocrdma_build_fr() (diff)
parent	IB/qib: Fix txselect regression (diff)
parent	IB/srp: Report receive errors correctly (diff)
download	linux-b4fdf52b3fc8dd3ce13ece334f5fdff869705429.tar.xz linux-b4fdf52b3fc8dd3ce13ece334f5fdff869705429.zip

Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', 'qib' and 'srp' into for-next