Merge branches 'mlx4', 'mlx5' and 'ocrdma' into k.o/for-4.6

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

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

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

diff --cc drivers/infiniband/hw/cxgb4/iw_cxgb4.h
Simple merge

diff --cc drivers/infiniband/hw/mlx5/main.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/mlx5_ib.h
Simple merge

diff --cc drivers/infiniband/ulp/iser/iser_verbs.c
Simple merge

diff --cc include/linux/mlx5/device.h
Simple merge

diff --cc include/linux/mlx5/mlx5_ifc.h
Simple merge

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