From: Linus Torvalds Date: Fri, 9 Mar 2007 00:04:11 +0000 (-0800) Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband X-Git-Tag: v2.6.21-rc4~79 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=eb9c4f2ef7150ea2144b53811d1cf555d8e27f69;p=linux-2.6-omap-h63xx.git Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IPoIB: Turn on interface's carrier after broadcast group is joined RDMA/ucma: Avoid sending reject if backlog is full RDMA/cxgb3: Fix MR permission problems RDMA/cxgb3: Don't reuse skbs that are non-linear or cloned RDMA/cxgb3: Squelch logging AE errors RDMA/cxgb3: Stop EP timer when MPA exchange is aborted by peer RDMA/cxgb3: Move QP to error on destroy if the state is IDLE RDMA/cxgb3: Fixes for "normal close" failures RDMA/cxgb3: Fix build on sparc64 RDMA/cma: Initialize rdma_bind_list in cma_alloc_any_port() RDMA/cxgb3: Don't use mm after it's freed in iwch_mmap() RDMA/cxgb3: Start ep timer on a MPA reject IB/mthca: Fix error path in mthca_alloc_memfree() IB/ehca: Fix sync between completion handler and destroy cq IPoIB: Only handle async events for one port --- eb9c4f2ef7150ea2144b53811d1cf555d8e27f69