Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'nes...

diff --cc drivers/infiniband/core/ucma.c
Simple merge

diff --cc drivers/infiniband/core/uverbs_cmd.c
Simple merge

diff --cc drivers/infiniband/hw/mlx4/cq.c
Simple merge

diff --cc include/rdma/ib_verbs.h
Simple merge