drivers/infiniband/ulp/srp/ib_srp.h · 048ccca8c1c8f583deec3367d7df521bb1f542ae · Kirill Smelkov / linux

Merge branch 'rdma-cq.2' of git://git.infradead.org/users/hch/rdma into 4.5/rdma-cq · c6333f9f

Doug Ledford authored Dec 15, 2015

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

c6333f9f

ib_srp.h 7.51 KB

Replace ib_srp.h