summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | | * IB/srp: rework mapping engine to use multiple FMR entriesDavid Dillow2011-03-152-129/+266
| | | | * IB/srp: allow sg_tablesize to be set for each targetDavid Dillow2011-03-152-24/+59
| | | | * IB/srp: move IB CM setup completion into its own functionDavid Dillow2011-03-151-71/+73
| | | | * IB/srp: always avoid non-zero offsets into an FMRDavid Dillow2011-03-151-16/+1
| | * | | RDMA/nes: Don't print success message at level KERN_ERRRoland Dreier2011-03-181-1/+1
| | |/ /
| * | | IB: Increase DMA max_segment_size on Mellanox hardwareDavid Dillow2011-03-221-0/+3
| * | | IB/mad: Improve an error message so error code is includedMichael Heinz2011-03-181-1/+2
| * | | RDMA/addr: Fix return of uninitialized ret valueSean Hefty2011-03-171-1/+1
| |/ /
* | | Merge branch 'kvm-updates/2.6.39' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds2011-03-172-6/+6
|\ \ \
| * | | mm: export __get_user_pagesHuang Ying2011-03-172-6/+6
| |/ /
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6Linus Torvalds2011-03-171-0/+26
|\ \ \ | |/ / |/| |
| * | [SCSI] iser: export addr and portMike Christie2011-02-241-0/+26
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-03-165-58/+28
|\ \ \
| * | | ipv6: Convert to use flowi6 where applicable.David S. Miller2011-03-121-9/+9
| * | | net: Put flowi_* prefix on AF independent members of struct flowiDavid S. Miller2011-03-121-1/+1
| * | | ipv4: Create and use route lookup helpers.David S. Miller2011-03-124-45/+10