| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branches 'cxgb4' and 'qib' into for-next | Roland Dreier | 2011-06-17 | 2 | -8/+23 |
|\ |
|
| * | IB/qib: Ensure that LOS and DFE are being turned off | Mitko Haralanov | 2011-06-17 | 2 | -8/+23 |
* | | RDMA/cxgb4: Couple of abort fixes | Steve Wise | 2011-06-17 | 2 | -13/+38 |
* | | RDMA/cxgb4: Don't truncate MR lengths | Steve Wise | 2011-06-17 | 1 | -1/+1 |
* | | RDMA/cxgb4: Don't exceed hw IQ depth limit for user CQs | Steve Wise | 2011-06-17 | 1 | -0/+4 |
|/ |
|
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... | Linus Torvalds | 2011-05-26 | 18 | -150/+505 |
|\ |
|
| *---------. | Merge branches 'cma', 'cxgb3', 'cxgb4', 'misc', 'nes', 'netlink', 'srp' and '... | Roland Dreier | 2011-05-25 | 18 | -147/+500 |
| |\ \ \ \ \ \ |
|
| | | | | | | * | IB/uverbs: Add devnode method to set path/mode | Roland Dreier | 2011-05-23 | 1 | -0/+8 |
| | | | | | * | | IB/srp: Fix integer -> pointer cast warnings | Roland Dreier | 2011-05-23 | 1 | -2/+2 |
| | | | | | |/ |
|
| | | | | * | | RDMA/cma: Save PID of ID's owner | Nir Muchtar | 2011-05-25 | 1 | -0/+6 |
| | | | | * | | RDMA/cma: Add support for netlink statistics export | Nir Muchtar | 2011-05-25 | 1 | -0/+99 |
| | | | | * | | RDMA/cma: Pass QP type into rdma_create_id() | Sean Hefty | 2011-05-25 | 3 | -24/+40 |
| | | | | * | | RDMA/cma: Export enum cma_state in <rdma/rdma_cm.h> | Nir Muchtar | 2011-05-25 | 1 | -90/+80 |
| | | | | * | | RDMA: Add netlink infrastructure | Roland Dreier | 2011-05-20 | 5 | -3/+205 |
| | | | | * | | RDMA: Add error handling to ib_core_init() | Nir Muchtar | 2011-05-20 | 1 | -3/+11 |
| | | | | |/ |
|
| | | | * | | RDMA/nes: Add a check for strict_strtoul() | Liu Yuan | 2011-05-24 | 1 | -1/+3 |
| | | | * | | IB: Add devnode methods to cm_class and umad_class | Roland Dreier | 2011-05-23 | 2 | -0/+15 |
| | | | * | | IB/mad: Return EPROTONOSUPPORT when an RDMA device lacks the QP required | Ira Weiny | 2011-05-23 | 1 | -0/+7 |
| | | | |/ |
|
| | | * | | RDMA/cxgb4: Use completion objects for event blocking | Steve Wise | 2011-05-24 | 1 | -13/+5 |
| | | |/ |
|
| | * | | RDMA/cxgb3: Don't post zero-byte read if endpoint is going away | Steve Wise | 2011-05-24 | 3 | -13/+21 |
| | |/ |
|
| * | | RDMA/ucma: Add .nodename/.mode to tell userspace where to create device node | Roland Dreier | 2011-05-23 | 1 | -3/+5 |
| |/ |
|
* | | Add appropriate <linux/prefetch.h> include for prefetch users | Paul Gortmaker | 2011-05-22 | 1 | -0/+1 |
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 | Linus Torvalds | 2011-05-20 | 11 | -106/+40 |
|\ \ |
|
| * | | infiniband: Remove rt->rt_src usage in addr4_resolve() | David S. Miller | 2011-05-10 | 1 | -2/+7 |
| * | | ipv4: Make caller provide on-stack flow key to ip_route_output_ports(). | David S. Miller | 2011-05-03 | 2 | -2/+4 |
| * | | ethtool: cosmetic: Use ethtool ethtool_cmd_speed API | David Decotigny | 2011-04-29 | 1 | -2/+2 |
| * | | net: infiniband/ulp/ipoib: convert to hw_features | Michał Mirosław | 2011-04-20 | 5 | -46/+20 |
| * | | net: infiniband/hw/nes: convert to hw_features | Michał Mirosław | 2011-04-20 | 3 | -54/+7 |
* | | | Merge remote branch 'origin/master' into merge | Benjamin Herrenschmidt | 2011-05-20 | 13 | -189/+264 |
|\ \ \
| | |/
| |/| |
|
| | | | |
| | \ | |
| *-. \ | Merge branches 'cma', 'cxgb4' and 'qib' into for-next | Roland Dreier | 2011-05-12 | 8 | -111/+108 |
| |\ \ \ |
|
| | | * | | IB/qib: Use pci_dev->revision | Sergei Shtylyov | 2011-05-12 | 1 | -4/+1 |
| | | * | | IB/ipath: Use pci_dev->revision, again | Sergei Shtylyov | 2011-05-09 | 1 | -8/+1 |
| | | * | | IB/qib: Prevent driver hang with unprogrammed boards | Mitko Haralanov | 2011-05-09 | 1 | -1/+2 |
| | * | | | RDMA/cxgb4: EEH errors can hang the driver | Steve Wise | 2011-05-09 | 3 | -53/+66 |
| | * | | | RDMA/cxgb4: Reset wait condition atomically | Steve Wise | 2011-05-09 | 2 | -30/+26 |
| | * | | | RDMA/cxgb4: Fix missing parentheses | Roel Kluin | 2011-05-09 | 1 | -1/+1 |
| | * | | | RDMA/cxgb4: Initialization errors can cause crash | Steve Wise | 2011-05-09 | 1 | -3/+3 |
| | * | | | RDMA/cxgb4: Don't change QP state outside EP lock | Steve Wise | 2011-05-09 | 3 | -12/+9 |
| | |/ / |
|
| * | | | RDMA/iwcm: Get rid of enum iw_cm_event_status | Roland Dreier | 2011-05-09 | 3 | -10/+10 |
| * | | | RDMA/cma: Add an ID_REUSEADDR option | Hefty, Sean | 2011-05-09 | 2 | -67/+130 |
| * | | | RDMA/cma: Fix handling of IPv6 addressing in cma_use_port | Hefty, Sean | 2011-05-09 | 1 | -7/+22 |
| |/ / |
|
* | | | Merge branch 'merge' into next | Benjamin Herrenschmidt | 2011-05-19 | 3 | -3/+3 |
|\ \ \
| |/ / |
|
| * | | Revert wrong fixes for common misspellings | Lucas De Marchi | 2011-04-26 | 3 | -3/+3 |
| |/ |
|
* | | cxgb4: use pgprot_writecombine() on powerpc | Nishanth Aravamudan | 2011-04-27 | 1 | -4/+1 |
|/ |
|
* | Fix common misspellings | Lucas De Marchi | 2011-03-31 | 22 | -33/+33 |
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... | Linus Torvalds | 2011-03-25 | 1 | -1/+1 |
|\ |
|
| * | RDMA/nes: Fix test of uninitialized netdev | Roland Dreier | 2011-03-24 | 1 | -1/+1 |
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 | Linus Torvalds | 2011-03-25 | 1 | -6/+5 |
|\ \
| |/
|/| |
|
| * | mlx4: generalization of multicast steering. | Yevgeny Petrilin | 2011-03-23 | 1 | -5/+5 |
| * | mlx4_en: Reporting HW revision in ethtool -i | Yevgeny Petrilin | 2011-03-23 | 1 | -1/+0 |