summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-02-198-41/+62
|\
| * Merge branches 'nes' and 'qib' into for-nextRoland Dreier2011-02-171-1/+4
| |\
| | * IB/qib: Prevent double completions after a timeout or RNR errorMike Marciniszyn2011-02-171-1/+2
| | * IB/qib: Fix double add_timer()Mike Marciniszyn2011-02-101-0/+2
| * | RDMA/nes: Don't generate async events for unregistered devicesMaciej Sosnowski2011-02-031-12/+20
| |/
| * Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-02-036-28/+38
| |\
| | *-------. Merge branches 'amso1100', 'cma', 'cxgb4', 'misc', 'mlx4' and 'qib' into for-...Roland Dreier2011-01-295-25/+35
| | |\ \ \ \ \
| | | | | | | * IB/qib: Hold link for TX SERDES settingsMitko Haralanov2011-01-281-19/+11
| | | | | | |/
| | | | | * / RDMA: Update missed conversion of flush_scheduled_work()Tejun Heo2011-01-281-1/+1
| | | | | |/
| | | | * | RDMA/cxgb4: Set the correct device physical function for iWARP connectionsSteve Wise2011-01-281-1/+1
| | | | * | RDMA/cxgb4: Limit MAXBURST EQ context field to 256BSteve Wise2011-01-281-2/+2
| | | | |/
| | | * / RDMA/ucma: Copy iWARP route information on queriesSteve Wise2011-01-281-2/+20
| | | |/
| | * / RDMA/amso1100: Fix compile warningsRalf Thielow2011-01-281-3/+3
| | |/
* | / net: make dev->master generalJiri Pirko2011-02-132-2/+3
|/ /
* / kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERTDavid Rientjes2011-01-202-2/+2
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-01-1731-122/+320
|\
| *-----. Merge branches 'misc', 'mlx4', 'mthca', 'nes' and 'srp' into for-nextRoland Dreier2011-01-1614-38/+269
| |\ \ \ \
| | | | | * IB/srp: Test only once whether iu allocation succeededBart Van Assche2011-01-131-8/+7
| | | | * | RDMA/nes: Fix incorrect SFP+ link status detection on driver initMaciej Sosnowski2011-01-161-4/+39
| | | | * | RDMA/nes: Fix SFP+ link down detection issue with switch port disableMaciej Sosnowski2011-01-164-0/+100
| | | | * | RDMA/nes: Generate IB_EVENT_PORT_ERR/PORT_ACTIVE eventsMaciej Sosnowski2011-01-164-9/+83
| | | | * | RDMA/nes: Fix bonding on iw_nesMaciej Sosnowski2011-01-162-6/+26
| | | | |/
| | | * / IB/mthca: Fix driver when sizeof (phys_addr_t) > sizeof (long)John L. Burr2011-01-115-6/+7
| | | |/
| | * | IB/mlx4: Handle protocol field in multicast tableAleksey Senin2011-01-121-4/+5
| | * | mlx4_{core, ib, en}: Fix driver when sizeof (phys_addr_t) > sizeof (long)Roland Dreier2011-01-121-1/+2
| | |/
| * | RDMA: Update workqueue usageTejun Heo2011-01-1612-50/+36
| * | RDMA: Use vzalloc() to replace vmalloc()+memset(0)Joe Perches2011-01-128-34/+15
| |/
* | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2011-01-133-3/+2
|\ \ | |/ |/|
| * Merge branch 'master' into for-nextJiri Kosina2010-12-227-82/+70
| |\
| * | infiniband: Only include mutex.h once in drivers/infiniband/hw/cxgb4/iw_cxgb4.hJesper Juhl2010-11-151-1/+0
| * | tree-wide: fix comment/printk typosUwe Kleine-König2010-11-012-2/+2
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-01-1135-618/+886
|\ \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| *-----------. \ \ Merge branches 'cxgb4', 'ipath', 'ipoib', 'mlx4', 'mthca', 'nes', 'qib' and '...Roland Dreier2011-01-1030-527/+884
| |\ \ \ \ \ \ \ \ \
| | | | | | | | * | | IB/srp: consolidate hot-path variables into cache linesDavid Dillow2011-01-102-17/+26
| | | | | | | | * | | IB/srp: stop sharing the host lock with SCSIBart Van Assche2011-01-102-23/+25
| | | | | | | | * | | IB/srp: reduce lock coverage of command completionBart Van Assche2011-01-101-23/+14
| | | | | | | | * | | IB/srp: reduce local coverage for command submission and EHBart Van Assche2011-01-102-58/+67
| | | | | | | | * | | IB/srp: don't move active requests to their own listBart Van Assche2011-01-102-11/+13
| | | | | | | | * | | IB/srp: allow lockless work postingBart Van Assche2011-01-052-44/+28
| | | | | | | | * | | IB/srp: consolidate state change codeBart Van Assche2011-01-051-21/+24
| | | | | | | | * | | IB/srp: allow task management without a previous requestDavid Dillow2011-01-052-63/+37
| | | | | | | | | |/ | | | | | | | | |/|
| | | | | | | * | | IB/qib: Fix refcount leak in lkey/rkey validationMike Marciniszyn2011-01-101-16/+14
| | | | | | | * | | IB/qib: Improve SERDES tunning on QMH boardsMike Marciniszyn2011-01-101-3/+23
| | | | | | | * | | IB/qib: Unnecessary delayed completions on RC connectionMike Marciniszyn2011-01-101-0/+24
| | | | | | | * | | IB/qib: Issue pre-emptive NAKs on eager buffer overflowMike Marciniszyn2011-01-101-4/+137
| | | | | | | * | | IB/qib: RDMA lkey/rkey validation is inefficient for large MRsMike Marciniszyn2011-01-103-23/+60
| | | | | | | * | | IB/qib: Change QPN incrementMike Marciniszyn2011-01-101-1/+1
| | | | | | | * | | IB/qib: Add fix missing from earlier patchMike Marciniszyn2011-01-101-31/+24
| | | | | | | * | | IB/qib: Change receive queue/QPN selectionMike Marciniszyn2011-01-104-31/+15
| | | | | | | * | | IB/qib: Fix interrupt mitigationMike Marciniszyn2011-01-105-8/+12