Merge branch 'misc' into k.o/for-next

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

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

diff --cc drivers/infiniband/hw/hfi1/driver.c
Simple merge

diff --cc drivers/infiniband/hw/hfi1/qp.c
Simple merge

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

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

diff --cc drivers/infiniband/hw/qib/qib_mad.c
Simple merge

diff --cc drivers/infiniband/sw/rxe/rxe_verbs.c
Simple merge

diff --cc drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c
Simple merge

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