aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
Commit message (Expand)AuthorAge
* Merge branches 'cxgb4' and 'qib' into for-nextRoland Dreier2011-06-17
|\
| * IB/qib: Ensure that LOS and DFE are being turned offMitko Haralanov2011-06-17
* | RDMA/cxgb4: Couple of abort fixesSteve Wise2011-06-17
* | RDMA/cxgb4: Don't truncate MR lengthsSteve Wise2011-06-17
* | RDMA/cxgb4: Don't exceed hw IQ depth limit for user CQsSteve Wise2011-06-17
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-05-26
|\
| *---------. Merge branches 'cma', 'cxgb3', 'cxgb4', 'misc', 'nes', 'netlink', 'srp' and '...Roland Dreier2011-05-25
| |\ \ \ \ \ \
| | | | | | | * IB/uverbs: Add devnode method to set path/modeRoland Dreier2011-05-23
| | | | | | * | IB/srp: Fix integer -> pointer cast warningsRoland Dreier2011-05-23
| | | | | | |/
| | | | | * | RDMA/cma: Save PID of ID's ownerNir Muchtar2011-05-25
| | | | | * | RDMA/cma: Add support for netlink statistics exportNir Muchtar2011-05-25
| | | | | * | RDMA/cma: Pass QP type into rdma_create_id()Sean Hefty2011-05-25
| | | | | * | RDMA/cma: Export enum cma_state in <rdma/rdma_cm.h>Nir Muchtar2011-05-25
| | | | | * | RDMA: Add netlink infrastructureRoland Dreier2011-05-20
| | | | | * | RDMA: Add error handling to ib_core_init()Nir Muchtar2011-05-20
| | | | | |/
| | | | * | RDMA/nes: Add a check for strict_strtoul()Liu Yuan2011-05-24
| | | | * | IB: Add devnode methods to cm_class and umad_classRoland Dreier2011-05-23
| | | | * | IB/mad: Return EPROTONOSUPPORT when an RDMA device lacks the QP requiredIra Weiny2011-05-23
| | | | |/
| | | * / RDMA/cxgb4: Use completion objects for event blockingSteve Wise2011-05-24
| | | |/
| | * / RDMA/cxgb3: Don't post zero-byte read if endpoint is going awaySteve Wise2011-05-24
| | |/
| * / RDMA/ucma: Add .nodename/.mode to tell userspace where to create device nodeRoland Dreier2011-05-23
| |/
* | Add appropriate <linux/prefetch.h> include for prefetch usersPaul Gortmaker2011-05-23
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-05-20
|\ \
| * | infiniband: Remove rt->rt_src usage in addr4_resolve()David S. Miller2011-05-10
| * | ipv4: Make caller provide on-stack flow key to ip_route_output_ports().David S. Miller2011-05-03
| * | ethtool: cosmetic: Use ethtool ethtool_cmd_speed APIDavid Decotigny2011-04-29
| * | net: infiniband/ulp/ipoib: convert to hw_featuresMichał Mirosław2011-04-20
| * | net: infiniband/hw/nes: convert to hw_featuresMichał Mirosław2011-04-20
* | | Merge remote branch 'origin/master' into mergeBenjamin Herrenschmidt2011-05-20
|\ \ \ | | |/ | |/|
| | |
| | \
| *-. \ Merge branches 'cma', 'cxgb4' and 'qib' into for-nextRoland Dreier2011-05-12
| |\ \ \
| | | * | IB/qib: Use pci_dev->revisionSergei Shtylyov2011-05-12
| | | * | IB/ipath: Use pci_dev->revision, againSergei Shtylyov2011-05-10
| | | * | IB/qib: Prevent driver hang with unprogrammed boardsMitko Haralanov2011-05-10
| | * | | RDMA/cxgb4: EEH errors can hang the driverSteve Wise2011-05-10
| | * | | RDMA/cxgb4: Reset wait condition atomicallySteve Wise2011-05-10
| | * | | RDMA/cxgb4: Fix missing parenthesesRoel Kluin2011-05-10
| | * | | RDMA/cxgb4: Initialization errors can cause crashSteve Wise2011-05-10
| | * | | RDMA/cxgb4: Don't change QP state outside EP lockSteve Wise2011-05-10
| | |/ /
| * | | RDMA/iwcm: Get rid of enum iw_cm_event_statusRoland Dreier2011-05-10
| * | | RDMA/cma: Add an ID_REUSEADDR optionHefty, Sean2011-05-10
| * | | RDMA/cma: Fix handling of IPv6 addressing in cma_use_portHefty, Sean2011-05-10
| |/ /
* | | Merge branch 'merge' into nextBenjamin Herrenschmidt2011-05-19
|\| |
| * | Revert wrong fixes for common misspellingsLucas De Marchi2011-04-27
| |/
* / cxgb4: use pgprot_writecombine() on powerpcNishanth Aravamudan2011-04-27
|/
* Fix common misspellingsLucas De Marchi2011-03-31
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-03-26
|\
| * RDMA/nes: Fix test of uninitialized netdevRoland Dreier2011-03-24
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-03-26
|\ \ | |/ |/|
| * mlx4: generalization of multicast steering.Yevgeny Petrilin2011-03-23
| * mlx4_en: Reporting HW revision in ethtool -iYevgeny Petrilin2011-03-23