Hi Doug,
Today's linux-next merge of the rdma tree got a conflict in:
net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
between commit:
c91aed989694 ("svcrdma: handle rdma read with a non-zero initial page offset")
from Linus' tree and commit:
412a15c0fe53 ("svcrdma: Port to new memory registration API")
from the rdma tree.
I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).
Hi Stephen,
The fix looks correct to me.
Cheers,
Sagi.
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
