summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
Commit message (Expand)AuthorAgeFilesLines
* Merge branches 'ipoib' and 'iser' into for-nextRoland Dreier2011-08-173-5/+9
|\
| * IB/iser: Support iSCSI PDU paddingOr Gerlitz2011-08-172-4/+8
| * IBiser: Fix wrong mask when sizeof (dma_addr_t) > sizeof (unsigned long)Or Gerlitz2011-08-171-1/+1
* | IPoIB: Fix possible NULL dereference in ipoib_start_xmit()Bernd Schubert2011-08-161-3/+5
|/
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/...Linus Torvalds2011-07-271-1/+1
|\
| * iscsi: Resolve iscsi_proto.h naming conflicts with drivers/target/iscsiNicholas Bellinger2011-07-251-1/+1
* | atomic: use <linux/atomic.h>Arun Sharma2011-07-265-5/+5
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-07-2236-1083/+683
|\
| *-----------. Merge branches 'cma', 'cxgb4', 'ipath', 'misc', 'mlx4', 'mthca', 'qib' and 's...Roland Dreier2011-07-2235-1043/+639
| |\ \ \ \ \ \ \
| | | | | | | | * IB/srp: Avoid duplicate devices from LUN scanBart Van Assche2011-07-131-0/+2
| | | | | | | * | IB/qib: Defer HCA error events to taskletMike Marciniszyn2011-07-222-21/+53
| | | | | | | * | IB/qib: Update active link widthMitko Haralanov2011-07-181-3/+23
| | | | | | | * | IB/qib: Fix potential deadlock with link down interruptRam Vepa2011-07-181-2/+3
| | | | | | | * | IB/qib: Add sysfs interface to read free contextsRam Vepa2011-07-181-0/+14
| | | | | | | * | IB/qib: Remove double defineEdwin van Vliet2011-07-181-1/+0
| | | | | | | * | IB/qib: Remove unnecessary read of PCI_CAP_ID_EXPJon Mason2011-07-181-4/+4
| | | | | | | * | IB/qib: Convert old cpumask api into new oneMotohiro KOSAKI2011-07-181-5/+6
| | | | | | | |/
| | | | | | * | IB/mthca: Remove unnecessary read of PCI_CAP_ID_EXPJon Mason2011-07-182-2/+2
| | | | | | * | IB/mthca: Stop returning separate error and status from FW commandsGoldwyn Rodrigues2011-07-1512-611/+342
| | | | | | |/
| | | | | * | IB/mlx4: Support PMA counters for IBoEOr Gerlitz2011-07-181-1/+67
| | | | | * | IB/mlx4: Use flow counters on IBoE portsOr Gerlitz2011-07-183-3/+27
| | | | | * | IB/pma: Add include file for IBA performance counters definitionsOr Gerlitz2011-07-183-344/+75
| | | | | * | IB/mlx4: Generate GID change events in IBoE codeOr Gerlitz2011-07-181-1/+1
| | | | | * | IB/core: Add GID change eventOr Gerlitz2011-07-181-1/+2
| | | | | |/
| | | | * / RDMA: Allow for NULL .modify_device() and .modify_port() methodsBart Van Assche2011-07-185-36/+6
| | | | |/
| | | * / IB/ipath: Convert old cpumask api into new oneMotohiro KOSAKI2011-07-181-4/+7
| | | |/
| | * / RDMA/cxgb4: Use printk_ratelimited() instead of printk_ratelimit()Manuel Zerpies2011-07-181-4/+5
| | |/
| * | RDMA/cma: Don't allow IPoIB port space for IBoEMoni Shoua2011-07-181-0/+4
| * | RDMA/cma: Avoid assigning an IS_ERR value to cm_id pointer in CMA id objectJack Morgenstein2011-07-181-40/+40
| |/
* | nes: do vlan cleanupJiri Pirko2011-07-213-28/+45
* | net: Abstract dst->neighbour accesses behind helpers.David S. Miller2011-07-176-50/+74
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-07-142-2/+4
|\|
| * RDMA: Check for NULL mode in .devnode methodsGoldwyn Rodrigues2011-07-042-2/+4
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-07-056-22/+66
|\|
| * Merge branches 'cxgb4' and 'qib' into for-nextRoland Dreier2011-06-172-8/+23
| |\
| | * IB/qib: Ensure that LOS and DFE are being turned offMitko Haralanov2011-06-172-8/+23
| * | RDMA/cxgb4: Couple of abort fixesSteve Wise2011-06-172-13/+38
| * | RDMA/cxgb4: Don't truncate MR lengthsSteve Wise2011-06-171-1/+1
| * | RDMA/cxgb4: Don't exceed hw IQ depth limit for user CQsSteve Wise2011-06-171-0/+4
| |/
* | rtnetlink: Compute and store minimum ifinfo dump sizeGreg Rose2011-06-091-1/+1
* | net: remove interrupt.h inclusion from netdevice.hAlexey Dobriyan2011-06-062-0/+2
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-05-2618-150/+505
|\
| *---------. Merge branches 'cma', 'cxgb3', 'cxgb4', 'misc', 'nes', 'netlink', 'srp' and '...Roland Dreier2011-05-2518-147/+500
| |\ \ \ \ \ \
| | | | | | | * IB/uverbs: Add devnode method to set path/modeRoland Dreier2011-05-231-0/+8
| | | | | | * | IB/srp: Fix integer -> pointer cast warningsRoland Dreier2011-05-231-2/+2
| | | | | | |/
| | | | | * | RDMA/cma: Save PID of ID's ownerNir Muchtar2011-05-251-0/+6
| | | | | * | RDMA/cma: Add support for netlink statistics exportNir Muchtar2011-05-251-0/+99
| | | | | * | RDMA/cma: Pass QP type into rdma_create_id()Sean Hefty2011-05-253-24/+40
| | | | | * | RDMA/cma: Export enum cma_state in <rdma/rdma_cm.h>Nir Muchtar2011-05-251-90/+80
| | | | | * | RDMA: Add netlink infrastructureRoland Dreier2011-05-205-3/+205