Merge branch 'hfi1' into k.o/for-4.14
authorDoug Ledford <dledford@redhat.com>
Mon, 24 Jul 2017 12:33:43 +0000 (08:33 -0400)
committerDoug Ledford <dledford@redhat.com>
Mon, 24 Jul 2017 12:33:43 +0000 (08:33 -0400)
commit03da084ed8804ddc5918883be84245b53393b8fb
tree564a4860cb9c5de3f504fd6156110d95b1c9f26b
parent520eccdfe187591a51ea9ab4c1a024ae4d0f68d9
parentbc5214ee29220251e5507882696ded5ca183b169
Merge branch 'hfi1' into k.o/for-4.14
drivers/infiniband/hw/hfi1/qp.c
drivers/infiniband/hw/hfi1/verbs.c
drivers/infiniband/hw/hfi1/vnic_main.c
drivers/infiniband/hw/qib/qib_verbs.h
drivers/infiniband/sw/rdmavt/qp.c
drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c
include/rdma/ib_verbs.h
include/rdma/rdma_vt.h
include/rdma/rdmavt_qp.h