tree b243b4687b65c036f29c2835384ff1312c9e6c18
parent 9ffecb10283508260936b96022d4ee43a7798b4c
parent 25556ae6b965321c7e7469faa06ddbeae50dac91
author Doug Ledford <dledford@redhat.com> 1446085269 -0400
committer Doug Ledford <dledford@redhat.com> 1446085269 -0400

Merge branch 'wr-cleanup' of git://git.infradead.org/users/hch/rdma into wr-cleanup

Signed-off-by: Doug Ledford <dledford@redhat.com>

Conflicts:
	drivers/infiniband/ulp/isert/ib_isert.c - Commit 4366b19ca5eb
	(iser-target: Change the recv buffers posting logic) changed the
	logic in isert_put_datain() and had to be hand merged