From: Linus Torvalds Date: Wed, 10 Jan 2007 03:48:15 +0000 (-0800) Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband X-Git-Tag: v2.6.20-rc5~31 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=f3a2c3ee458bd614231e548c13acb0cf33a68631;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: IB/mthca: Don't execute QUERY_QP firmware command for QP in RESET state IB/ehca: Use proper GFP_ flags for get_zeroed_page() IB/mthca: Fix PRM compliance problem in atomic-send completions RDMA/ucma: Don't report events with invalid user context RDMA/ucma: Fix struct ucma_event leak when backlog is full RDMA/iwcm: iWARP connection timeouts shouldn't be reported as rejects IB/iser: Return error code when PDUs may not be sent IB/mthca: Fix off-by-one in FMR handling on memfree --- f3a2c3ee458bd614231e548c13acb0cf33a68631