| commit | c6333f9f9f7646e311248a09e8ed96126a97aba8 | [log] [tgz] |
|---|---|---|
| author | Doug Ledford <dledford@redhat.com> | Tue Dec 15 14:10:44 2015 -0500 |
| committer | Doug Ledford <dledford@redhat.com> | Tue Dec 15 14:10:44 2015 -0500 |
| tree | 1a86124c5b43fa858f1d8d7beb99bcd29d6d6ab7 | |
| parent | 9f9499ae8e6415cefc4fe0a96ad0e27864353c89 [diff] | |
| parent | cfeb91b375ad5f52665e00d374a4e403d2e6063e [diff] |
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