Merge branch 'hfi1' into k.o/for-4.14

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

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

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

diff --cc drivers/infiniband/hw/qib/qib_verbs.h
Simple merge

diff --cc drivers/infiniband/sw/rdmavt/qp.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

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

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