aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2010-08-046-8/+19
|\
| * IB/{nes, ipoib}: Pass supported flags to ethtool_op_set_flags()Ben Hutchings2010-07-042-2/+13
| * net-next: remove useless union keywordChangli Gao2010-06-104-6/+6
* | IB/qib: Use request_firmware() to load SD7220 firmwareBen Hutchings2010-07-084-1100/+46
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2010-07-0815-66/+148
|\ \
| | \
| | \
| *-. \ Merge branches 'cxgb4', 'ipoib' and 'qib' into for-nextRoland Dreier2010-07-089-41/+106
| |\ \ \
| | | * | IB/qib: Clean up properly if qib_init() failsRalph Campbell2010-07-061-0/+10
| | | * | IB/qib: Completion queue callback needs to be single threadedRalph Campbell2010-07-061-1/+1
| | | * | IB/qib: Update 7322 serdes tablesRalph Campbell2010-07-061-4/+12
| | | * | IB/qib: Clear 6120 hardware error registerRalph Campbell2010-07-061-2/+1
| | | * | IB/qib: Clear eager buffer memory for each new processRalph Campbell2010-07-061-0/+3
| | | * | IB/qib: Mask hardware error during link resetRalph Campbell2010-07-062-26/+31
| | | * | IB/qib: Don't mark VL15 bufs as WC to avoid a rare 7322 chip problemDave Olson2010-07-066-6/+46
| | | |/
| | * | IPoIB: Fix world-writable child interface control sysfs attributesOr Gerlitz2010-07-061-2/+2
| | |/
| * | RDMA/cxgb4: Derive smac_idx from port viidSteve Wise2010-07-061-4/+5
| * | RDMA/cxgb4: Avoid false GTS CIDX_INC overflowsSteve Wise2010-07-061-5/+20
| * | RDMA/cxgb4: Don't call abort_connection() for active connect failuresSteve Wise2010-07-061-1/+2
| * | RDMA/cxgb4: Use the DMA state API instead of the pci equivalentsFUJITA Tomonori2010-07-065-15/+15
| |/
* | fix the deadlock in qib_fsAl Viro2010-06-041-3/+1
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2010-05-305-622/+203
|\
| * Merge branches 'misc' and 'qib' into for-nextRoland Dreier2010-05-274-614/+200
| |\
| | * IB/qib: Remove DCA support until feature is finishedRalph Campbell2010-05-271-189/+0
| | * IB/qib: Use a single txselect module parameter for serdes tuningRalph Campbell2010-05-261-403/+179
| | * IB/qib: Don't rely on (undefined) order of function parameter evaluationRoland Dreier2010-05-261-10/+15
| | * IB/qib: Fix undefined symbol error when CONFIG_PCI_MSI=nRalph Campbell2010-05-252-12/+6
| * | IB/ucm: Use memdup_user()Julia Lawall2010-05-251-8/+3
| |/
* | ehca: convert cpu notifier to return encapsulate errno valueAkinobu Mita2010-05-271-1/+1
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2010-05-2577-5126/+51061
|\
| *-----. Merge branches 'cxgb4', 'misc', 'mlx4', 'nes' and 'qib' into for-nextRoland Dreier2010-05-2571-5051/+50957
| |\ \ \ \
| | | | | * IB/ipath: Remove support for QLogic PCIe QLE devicesRalph Campbell2010-05-239-7131/+7
| | | | | * IB/qib: Add new qib driver for QLogic PCIe InfiniBand adaptersRalph Campbell2010-05-2351-0/+52965
| | | | | * IB/core: Allow device-specific per-port sysfs filesRalph Campbell2010-05-2111-15/+32
| | | | |/ | | | |/|
| | | | * RDMA/nes: Fix incorrect unlock in nes_process_mac_intr()Chien Tung2010-05-251-1/+2
| | | | * RDMA/nes: Async event for closed QP causes crashFaisal Latif2010-05-241-0/+9
| | | | * RDMA/nes: Have ethtool read hardware registers for rx/tx statsFaisal Latif2010-05-241-17/+55
| | | |/
| | * | IB/mad: Make needlessly global mad_sendq_size/mad_recvq_size staticRoland Dreier2010-05-231-2/+2
| | |/
| * | RDMA/cxgb4: Only insert sq qid in lookup tableSteve Wise2010-05-241-16/+9
| * | RDMA/cxgb4: Support IB_WR_READ_WITH_INV opcodeSteve Wise2010-05-241-1/+5
| * | RDMA/cxgb4: Set fence flag for inv-local-stag work requestsSteve Wise2010-05-241-0/+2
| * | RDMA/cxgb4: Update some HW limitsSteve Wise2010-05-241-8/+9
| * | RDMA/cxgb4: Don't limit fastreg page list depthSteve Wise2010-05-241-3/+0
| * | RDMA/cxgb4: Return proper errors in fastreg mr/pbl allocationSteve Wise2010-05-241-2/+6
| * | RDMA/cxgb4: Fix overflow bug in CQ armSteve Wise2010-05-241-19/+12
| * | RDMA/cxgb4: Optimize CQ overflow detectionSteve Wise2010-05-242-12/+17
| * | RDMA/cxgb4: CQ size must be IQ size - 2Steve Wise2010-05-241-1/+4
| * | RDMA/cxgb4: Register RDMA provider based on LLD state_change eventsSteve Wise2010-05-243-10/+39
| * | RDMA/cxgb4: Detach from the LLD after unregistering RDMA deviceSteve Wise2010-05-241-3/+1
| |/
* | Merge remote branch 'origin' into secretlab/next-devicetreeGrant Likely2010-05-2251-267/+9820
|\ \
| * \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2010-05-202-14/+8
| |\ \ | | |/ | |/|
| | * Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-04-1180-11/+101
| | |\