Merge branches '4.5/Or-cleanup' and '4.5/rdma-cq' into k.o/for-4.5
authorDoug Ledford <dledford@redhat.com>
Tue, 22 Dec 2015 22:03:15 +0000 (17:03 -0500)
committerDoug Ledford <dledford@redhat.com>
Tue, 22 Dec 2015 22:03:15 +0000 (17:03 -0500)
commit882f3b3b916a01c703bf7516800a0dca741cd3e7
tree3a67f04a2b31985bb8044d39f0f5ebd9858658ae
parent182a2da0c768a9ec64abb0d6009667057f1c06af
parentc6333f9f9f7646e311248a09e8ed96126a97aba8
Merge branches '4.5/Or-cleanup' and '4.5/rdma-cq' into k.o/for-4.5

Signed-off-by: Doug Ledford <dledford@redhat.com>
Conflicts:
drivers/infiniband/ulp/iser/iser_verbs.c
drivers/infiniband/core/device.c
drivers/infiniband/ulp/ipoib/ipoib_cm.c
drivers/infiniband/ulp/iser/iscsi_iser.h
drivers/infiniband/ulp/iser/iser_memory.c
drivers/infiniband/ulp/iser/iser_verbs.c
drivers/infiniband/ulp/srp/ib_srp.c
drivers/infiniband/ulp/srpt/ib_srpt.c
drivers/infiniband/ulp/srpt/ib_srpt.h
include/rdma/ib_verbs.h