Prev: rfkill sysfs ABI
Next: [PATCH v4 05/11] swiotlb: add swiotlb_set_default_size()
From: Roland Dreier on 12 Mar 2010 14:00
Linus, please pull from

master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus

This tree is also available from kernel.org mirrors at:

git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus

This will get a few small fixes:

Chien Tung (2):
RDMA/nes: Clear stall bit before destroying NIC QP
RDMA/nes: Fix CX4 link problem in back-to-back configuration

Eli Cohen (1):
IPoIB: Fix TX queue lockup with mixed UD/CM traffic

Faisal Latif (1):
RDMA/nes: Set assume_aligned_header bit

Or Gerlitz (1):
IPoIB: Include return code in trace message for ib_post_send() failures

Roland Dreier (1):
Merge branches 'cxgb3', 'ipoib', 'misc' and 'nes' into for-next

Steve Wise (2):
IB/mad: Ignore iWARP devices on device removal
RDMA/cxgb3: Wait at least one schedule cycle during device removal

drivers/infiniband/core/mad.c | 3 +++
drivers/infiniband/hw/cxgb3/iwch.c | 2 ++
drivers/infiniband/hw/nes/nes_hw.c | 8 ++++++++
drivers/infiniband/hw/nes/nes_hw.h | 1 +
drivers/infiniband/hw/nes/nes_nic.c | 30 ++++++++++++++++++++++++++++--
drivers/infiniband/hw/nes/nes_verbs.c | 1 +
drivers/infiniband/ulp/ipoib/ipoib_cm.c | 10 +++++++---
drivers/infiniband/ulp/ipoib/ipoib_ib.c | 9 +++++----
8 files changed, 55 insertions(+), 9 deletions(-)

--
Roland Dreier <rolandd(a)cisco.com>
For corporate legal information go to:
http://www.cisco.com/web/about/doing_business/legal/cri/index.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: rfkill sysfs ABI
Next: [PATCH v4 05/11] swiotlb: add swiotlb_set_default_size()