Merge branches 'bart-srp', 'generic-errors', 'ira-cleanups' and 'mwang-v8' into k...
authorDoug Ledford <dledford@redhat.com>
Wed, 20 May 2015 20:12:40 +0000 (16:12 -0400)
committerDoug Ledford <dledford@redhat.com>
Wed, 20 May 2015 20:12:40 +0000 (16:12 -0400)
commit175e8efe69974e240a89fb3a4bbeeb0b892de10d
tree05762cd97d6851c1c0094d239417c8ba6d300671
parent985aa49556a576416d3f960f8fc1c6513863e33e
parent3c88f3dcff7bfd5059b704bdede2bfe972c0cec9
parentf766c58fa3ea38a30912df8b5af3ca40637fe5e9
parent5d9fb0440698a8b9e8595353d60cfac7ab30efae
Merge branches 'bart-srp', 'generic-errors', 'ira-cleanups' and 'mwang-v8' into k.o/for-4.2
drivers/infiniband/core/cma.c
drivers/infiniband/core/mad.c
drivers/infiniband/core/user_mad.c
drivers/infiniband/core/verbs.c
drivers/infiniband/ulp/srp/ib_srp.c
include/rdma/ib_verbs.h
net/sunrpc/xprtrdma/svc_rdma_transport.c