summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2013-02-211-1/+1
|\
| * IB: cxgb3: delay freeing mem untill entirely done with itJesper Juhl2013-01-291-1/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-02-083-14/+9
|\ \
| | \
| | \
| *-. \ Merge branches 'ipoib', 'mlx4' and 'qib' into for-nextRoland Dreier2013-02-051-8/+3
| |\ \ \ | | | |/ | | |/|
| | | * IB/qib: Fix for broken sparse warning fixMike Marciniszyn2013-02-051-8/+3
| | |/
| * / IPoIB: Fix crash due to skb double destructShlomo Pongratz2013-02-052-6/+6
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-01-1510-39/+33
|\|
| * Drivers: infinband: remove __dev* attributes.Greg Kroah-Hartman2013-01-0310-39/+33
* | remove init of dev->perm_addr in driversJiri Pirko2013-01-081-1/+0
* | ethtool: fix drvinfo strings set in driversJiri Pirko2013-01-062-6/+8
* | nes: remove usage of dev->masterJiri Pirko2013-01-042-4/+6
|/
* Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/r...Linus Torvalds2012-12-215-116/+924
|\
| *-. Merge branches 'cxgb4', 'ipoib' and 'mlx4' into for-nextRoland Dreier2012-12-192-1/+5
| |\ \
| | * | IPoIB: Call skb_dst_drop() once skb is enqueued for sendingRoland Dreier2012-12-192-1/+5
| | |/
| * | RDMA/cxgb4: Fix bug for active and passive LE hash collision pathVipul Pandya2012-12-193-82/+352
| * | RDMA/cxgb4: Fix LE hash collision bug for passive open connectionVipul Pandya2012-12-192-55/+442
| * | RDMA/cxgb4: Fix LE hash collision bug for active open connectionVipul Pandya2012-12-192-6/+153
| |/
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2012-12-181-20/+0
|\ \ | |/ |/|
| * Merge branch 'merge' into nextBenjamin Herrenschmidt2012-11-264-55/+52
| |\
| * | powerpc: Move get_longbusy_msecs into hvcall.h and remove duplicate functionIan Munsie2012-11-151-20/+0
* | | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/...Linus Torvalds2012-12-152-103/+76
|\ \ \
| * | | ib_srpt: Convert TMR path to target_submit_tmrNicholas Bellinger2012-11-281-19/+18
| * | | ib_srpt: Convert I/O path to target_submit_cmd + drop legacy ioctx->krefNicholas Bellinger2012-11-282-71/+52
| * | | target: pass sense_reason as a return valueChristoph Hellwig2012-11-061-25/+18
| | |/ | |/|
* | | Merge branch 'nes' into for-nextRoland Dreier2012-12-084-26/+17
|\ \ \
| * | | RDMA/nes: Fix for crash when registering zero length MR for CQTatyana Nikolova2012-12-081-0/+5
| * | | RDMA/nes: Fix for terminate timer crashTatyana Nikolova2012-12-083-8/+6
| * | | RDMA/nes: Fix for BUG_ON due to adding already-pending timerTatyana Nikolova2012-12-081-18/+6
* | | | Merge branch 'srp' into for-nextRoland Dreier2012-11-302-134/+191
|\ \ \ \
| * | | | IB/srp: Allow SRP disconnect through sysfsBart Van Assche2012-11-301-0/+10
| * | | | IB/srp: send disconnect request without waiting for CM timewait exitVu Pham2012-11-301-4/+0
| * | | | IB/srp: destroy and recreate QP and CQs when reconnectingIshai Rabinovitz2012-11-301-31/+35
| * | | | IB/srp: Eliminate state SRP_TARGET_DEADBart Van Assche2012-11-302-56/+32
| * | | | IB/srp: Introduce the helper function srp_remove_target()Bart Van Assche2012-11-301-7/+12
| * | | | IB/srp: Suppress superfluous error messagesBart Van Assche2012-11-302-8/+31
| * | | | IB/srp: Process all error completionsBart Van Assche2012-11-301-4/+6
| * | | | IB/srp: Introduce srp_handle_qp_err()Bart Van Assche2012-11-302-18/+21
| * | | | IB/srp: Simplify SCSI error handlingBart Van Assche2012-11-301-4/+0
| * | | | IB/srp: Keep processing commands during host removalBart Van Assche2012-11-301-7/+0
| * | | | IB/srp: Eliminate state SRP_TARGET_CONNECTINGBart Van Assche2012-11-302-12/+14
| * | | | IB/srp: Increase block layer timeoutBart Van Assche2012-11-302-0/+47
| | |/ / | |/| |
| | | |
| \ \ \
*-. \ \ \ Merge branches 'cma' and 'mlx4' into for-nextRoland Dreier2012-11-292-7/+6
|\ \ \ \ \
| | * | | | IB/mlx4: Fix spinlock order to avoid lockdep warningsJack Morgenstein2012-11-291-2/+2
| * | | | | RDMA/cm: Change return value from find_gid_port()shefty2012-11-291-5/+4
| | |/ / / | |/| | |
| | | | |
| \ \ \ \
| \ \ \ \
| \ \ \ \
| \ \ \ \
| \ \ \ \
*-----. | | | | Merge branches 'cxgb4', 'misc', 'mlx4', 'nes' and 'uapi' into for-nextRoland Dreier2012-11-2610-61/+93
|\ \ \ \| | | | | | | |_|/ / / | | |/| | / / | | | | |/ / | | | |/| |
| | | * | | RDMA/nes: Use WARN()Julia Lawall2012-11-222-9/+5
| | | * | | RDMA/nes: Fix for incorrect multicast address in the perfect filter tableTatyana Nikolova2012-11-221-6/+7
| | | * | | RDMA/nes: Fix for sending fpdus in order to hardwareTatyana Nikolova2012-11-221-13/+10
| | | * | | RDMA/nes: Fix for unlinking skbs from empty listTatyana Nikolova2012-11-221-4/+7
| | | * | | RDMA/nes: Fix incorrect address of IP headerTatyana Nikolova2012-11-221-1/+1
| | | |/ /