From: Linus Torvalds Date: Wed, 21 May 2008 02:30:54 +0000 (-0700) Subject: Merge branch 'for-2.6.26' of git://linux-nfs.org/~bfields/linux X-Git-Tag: v2.6.26-rc4~90 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d40ace0c7b4a329f7d869d0fbf27435543bb2acc;p=linux-2.6-omap-h63xx.git Merge branch 'for-2.6.26' of git://linux-nfs.org/~bfields/linux * 'for-2.6.26' of git://linux-nfs.org/~bfields/linux: (25 commits) svcrdma: Verify read-list fits within RPCSVC_MAXPAGES svcrdma: Change svc_rdma_send_error return type to void svcrdma: Copy transport address and arm CQ before calling rdma_accept svcrdma: Set rqstp transport address in rdma_read_complete function svcrdma: Use ib verbs version of dma_unmap svcrdma: Cleanup queued, but unprocessed I/O in svc_rdma_free svcrdma: Move the QP and cm_id destruction to svc_rdma_free svcrdma: Add reference for each SQ/RQ WR svcrdma: Move destroy to kernel thread svcrdma: Shrink scope of spinlock on RQ CQ svcrdma: Use standard Linux lists for context cache svcrdma: Simplify RDMA_READ deferral buffer management svcrdma: Remove unused READ_DONE context flags bit svcrdma: Return error from rdma_read_xdr so caller knows to free context svcrdma: Fix error handling during listening endpoint creation svcrdma: Free context on post_recv error in send_reply svcrdma: Free context on ib_post_recv error svcrdma: Add put of connection ESTABLISHED reference in rdma_cma_handler svcrdma: Fix return value in svc_rdma_send svcrdma: Fix race with dto_tasklet in svc_rdma_send ... --- d40ace0c7b4a329f7d869d0fbf27435543bb2acc