Merge branch 'rdma-cq.2' of git://git.infradead.org/users/hch/rdma into 4.5/rdma-cq
authorDoug Ledford <dledford@redhat.com>
Tue, 15 Dec 2015 19:10:44 +0000 (14:10 -0500)
committerDoug Ledford <dledford@redhat.com>
Tue, 15 Dec 2015 19:10:44 +0000 (14:10 -0500)
commitc6333f9f9f7646e311248a09e8ed96126a97aba8
tree1a86124c5b43fa858f1d8d7beb99bcd29d6d6ab7
parent9f9499ae8e6415cefc4fe0a96ad0e27864353c89
parentcfeb91b375ad5f52665e00d374a4e403d2e6063e
Merge branch 'rdma-cq.2' of git://git.infradead.org/users/hch/rdma into 4.5/rdma-cq

Signed-off-by: Doug Ledford <dledford@redhat.com>
Conflicts:
drivers/infiniband/ulp/srp/ib_srp.c - Conflicts with changes in
ib_srp.c introduced during 4.4-rc updates
drivers/infiniband/ulp/iser/iser_verbs.c
drivers/infiniband/ulp/srp/ib_srp.c
drivers/infiniband/ulp/srp/ib_srp.h
drivers/scsi/Kconfig
include/rdma/ib_verbs.h