Linus, please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git
for-linus
This will get a few small fixes that have trickled in:
Chien Tung (1):
RDMA/nes: Correct cap.max_inline_data assignment in nes_query_qp()
Dan Carpenter (1):
IB/mlx4: Check correct variable for allocation failure
Jani Nikula (1):
IB/cm: Fix device_create() return value check
Roland Dreier (1):
Merge branches 'cma', 'misc', 'mlx4' and 'nes' into for-linus
shefty (1):
RDMA/cm: Set num_paths when manually assigning path records
drivers/infiniband/core/cm.c | 2 +-
drivers/infiniband/core/cma.c | 1 +
drivers/infiniband/hw/mlx4/mr.c | 2 +-
drivers/infiniband/hw/nes/nes_verbs.c | 9 ++++-----
4 files changed, 7 insertions(+), 7 deletions(-)
--
Roland Dreier <[email protected]> || For corporate legal information go to:
http://www.cisco.com/web/about/doing_business/legal/cri/index.html
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
