Merge branches 'misc', 'qedr', 'reject-helpers', 'rxe' and 'srp' into merge-test
authorDoug Ledford <dledford@redhat.com>
Wed, 14 Dec 2016 19:44:47 +0000 (14:44 -0500)
committerDoug Ledford <dledford@redhat.com>
Wed, 14 Dec 2016 19:44:47 +0000 (14:44 -0500)
commit9032ad78bb58f2567fc95125ee69cde7b74c0a21
treec92982d00aac2312e5c3a11d0ec7fbebab221fc3
parent86ef0beaa0bdbec70d4261977b8b4a100fe54bfe
parent46d0703fac3ffa12ec36f22f386d96d0f474c9c2
parent22b1ae6169e3cb9e33ba549a0c07a0cc469143d7
parent512fb1b32bac02ebec50e5060f94dc1ad23ed28f
parent37f69f43fb5aba4288d38ea32bbe0dfdb412c763
parent4fa354c9dbfef9226a690d8ee319b046f3067a6a
Merge branches 'misc', 'qedr', 'reject-helpers', 'rxe' and 'srp' into merge-test
drivers/infiniband/core/cm.c
drivers/infiniband/core/mad.c
drivers/infiniband/hw/hfi1/mad.c
drivers/infiniband/hw/mlx4/main.c
drivers/infiniband/hw/ocrdma/ocrdma_hw.c
drivers/infiniband/hw/qedr/verbs.c
drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c
drivers/infiniband/hw/usnic/usnic_ib_verbs.c
drivers/infiniband/sw/rxe/rxe_verbs.c
drivers/infiniband/ulp/isert/ib_isert.c