aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | | | * | RDMA: Add error handling to ib_core_init()Nir Muchtar2011-05-201-3/+11
| | | | | |/
| | | | * | RDMA/nes: Add a check for strict_strtoul()Liu Yuan2011-05-241-1/+3
| | | | * | IB: Add devnode methods to cm_class and umad_classRoland Dreier2011-05-232-0/+15
| | | | * | IB/mad: Return EPROTONOSUPPORT when an RDMA device lacks the QP requiredIra Weiny2011-05-231-0/+7
| | | | |/
| | | * | RDMA/cxgb4: Use completion objects for event blockingSteve Wise2011-05-241-13/+5
| | | |/
| | * | RDMA/cxgb3: Don't post zero-byte read if endpoint is going awaySteve Wise2011-05-243-13/+21
| | |/
| * | RDMA/ucma: Add .nodename/.mode to tell userspace where to create device nodeRoland Dreier2011-05-231-3/+5
| |/
* | Add appropriate <linux/prefetch.h> include for prefetch usersPaul Gortmaker2011-05-221-0/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-05-2011-106/+40
|\ \
| * | infiniband: Remove rt->rt_src usage in addr4_resolve()David S. Miller2011-05-101-2/+7
| * | ipv4: Make caller provide on-stack flow key to ip_route_output_ports().David S. Miller2011-05-032-2/+4
| * | ethtool: cosmetic: Use ethtool ethtool_cmd_speed APIDavid Decotigny2011-04-291-2/+2
| * | net: infiniband/ulp/ipoib: convert to hw_featuresMichał Mirosław2011-04-205-46/+20
| * | net: infiniband/hw/nes: convert to hw_featuresMichał Mirosław2011-04-203-54/+7
* | | Merge remote branch 'origin/master' into mergeBenjamin Herrenschmidt2011-05-2013-189/+264
|\ \ \ | | |/ | |/|
| | |
| | \
| *-. \ Merge branches 'cma', 'cxgb4' and 'qib' into for-nextRoland Dreier2011-05-128-111/+108
| |\ \ \
| | | * | IB/qib: Use pci_dev->revisionSergei Shtylyov2011-05-121-4/+1
| | | * | IB/ipath: Use pci_dev->revision, againSergei Shtylyov2011-05-091-8/+1
| | | * | IB/qib: Prevent driver hang with unprogrammed boardsMitko Haralanov2011-05-091-1/+2
| | * | | RDMA/cxgb4: EEH errors can hang the driverSteve Wise2011-05-093-53/+66
| | * | | RDMA/cxgb4: Reset wait condition atomicallySteve Wise2011-05-092-30/+26
| | * | | RDMA/cxgb4: Fix missing parenthesesRoel Kluin2011-05-091-1/+1
| | * | | RDMA/cxgb4: Initialization errors can cause crashSteve Wise2011-05-091-3/+3
| | * | | RDMA/cxgb4: Don't change QP state outside EP lockSteve Wise2011-05-093-12/+9
| | |/ /
| * | | RDMA/iwcm: Get rid of enum iw_cm_event_statusRoland Dreier2011-05-093-10/+10
| * | | RDMA/cma: Add an ID_REUSEADDR optionHefty, Sean2011-05-092-67/+130
| * | | RDMA/cma: Fix handling of IPv6 addressing in cma_use_portHefty, Sean2011-05-091-7/+22
| |/ /
* | | Merge branch 'merge' into nextBenjamin Herrenschmidt2011-05-193-3/+3
|\ \ \ | |/ /
| * | Revert wrong fixes for common misspellingsLucas De Marchi2011-04-263-3/+3
| |/
* | cxgb4: use pgprot_writecombine() on powerpcNishanth Aravamudan2011-04-271-4/+1
|/
* Fix common misspellingsLucas De Marchi2011-03-3122-33/+33
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-03-251-1/+1
|\
| * RDMA/nes: Fix test of uninitialized netdevRoland Dreier2011-03-241-1/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-03-251-6/+5
|\ \ | |/ |/|
| * mlx4: generalization of multicast steering.Yevgeny Petrilin2011-03-231-5/+5
| * mlx4_en: Reporting HW revision in ethtool -iYevgeny Petrilin2011-03-231-1/+0
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-03-246-252/+521
|\ \ | |/ |/|
| *-. Merge branches 'misc', 'nes' and 'srp' into for-nextRoland Dreier2011-03-233-250/+515
| |\ \
| | | * Merge branch 'external-indirect' of git://git.kernel.org/pub/scm/linux/kernel...Roland Dreier2011-03-212-249/+514
| | | |\
| | | | * IB/srp: try to use larger FMR sizes to cover our mappingsDavid Dillow2011-03-152-13/+21
| | | | * IB/srp: add support for indirect tables that don't fit in SRP_CMDDavid Dillow2011-03-152-12/+110