drivers/infiniband/ulp/srpt/ib_srpt.h · 882f3b3b916a01c703bf7516800a0dca741cd3e7 · Kirill Smelkov / linux · GitLab

Find file Blame History Permalink

Merge branches '4.5/Or-cleanup' and '4.5/rdma-cq' into k.o/for-4.5 · 882f3b3b
Doug Ledford authored Dec 22, 2015
```
Signed-off-by: Doug Ledford <dledford@redhat.com>

Conflicts:
	drivers/infiniband/ulp/iser/iser_verbs.c
```
882f3b3b

ib_srpt.h 12.7 KB