summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw
Commit message (Expand)AuthorAgeFilesLines
* mlx4: Avoid leaking steering rules on flow creation error flowOr Gerlitz2014-10-301-2/+8
* Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/r...Linus Torvalds2014-10-1910-258/+242
|\
| *-----. Merge branches 'core', 'cxgb4', 'iser', 'mlx5' and 'ocrdma' into for-nextRoland Dreier2014-10-1410-258/+242
| |\ \ \ \
| | | | | * RDMA/ocrdma: Save the bit environment, spare unncessary parenthesisJes Sorensen2014-10-101-19/+19
| | | | | * RDMA/ocrdma: The kernel has a perfectly good BIT() macro - use itJes Sorensen2014-10-102-103/+101
| | | | | * RDMA/ocrdma: Don't memset() buffers we just allocated with kzalloc()Jes Sorensen2014-10-101-9/+3
| | | | | * RDMA/ocrdma: Remove a unused-label warningLi RongQing2014-10-101-0/+2
| | | | | * RDMA/ocrdma: Convert kernel VA to PA for mmap in userDevesh Sharma2014-10-101-5/+5
| | | | | * RDMA/ocrdma: Get vlan tag from ib_qp_attrsSelvin Xavier2014-10-101-4/+5
| | | | | * RDMA/ocrdma: Add default GID at index 0Devesh Sharma2014-10-101-0/+10
| | |_|_|/ | |/| | |
| | | | * IB/mlx5: Modify to work with arbitrary page sizeYishai Hadas2014-10-091-8/+10
| | | | * IB/mlx5: Remove duplicate code from mlx5_set_pathEli Cohen2014-10-091-16/+5
| | | | * IB/mlx5: Fix possible array overflowEli Cohen2014-10-091-3/+3
| | | | * IB/mlx5: Improve debug prints in mlx5_ib_reg_user_mrEli Cohen2014-10-091-3/+3
| | | | * IB/mlx5: Clear umr resources after ib_unregister_deviceEli Cohen2014-10-091-1/+1
| | |_|/ | |/| |
| | | * IB/mlx5, iser, isert: Add Signature API additionsSagi Grimberg2014-10-091-59/+45
| | | * IB/mlx5: Use extended internal signature layoutSagi Grimberg2014-10-091-43/+37
| | | * IB/mlx5: Use enumerations for PI copy maskSagi Grimberg2014-10-091-3/+3
| | |/ | |/|
| | * RDMA/cxgb4: Fix ntuple calculation for ipv6 and remove duplicate lineHariprasad S2014-10-141-4/+3
| | * RDMA/cxgb4: Add missing neigh_release in find_routeHariprasad S2014-10-141-0/+1
| | * RDMA/cxgb4: Take IPv6 into account for best_mtu and set_emssHariprasad S2014-10-141-8/+16
| | * RDMA/cxgb4: Make c4iw_wr_log_size_order staticSteve Wise2014-10-141-1/+1
| |/
* | Merge tag 'iommu-updates-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2014-10-151-1/+1
|\ \
| | \
| | \
| | \
| | \
| *---. \ Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' an...Joerg Roedel2014-10-021-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | | | * IB/usnic: Convert to use new iommu_capable() API functionJoerg Roedel2014-09-251-1/+1
| | | |/
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2014-10-132-2/+0
|\ \ \ \
| * | | | [infiniband] remove pointless assignmentsAl Viro2014-10-092-2/+0
| |/ / /
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2014-10-085-68/+103
|\ \ \ \
| * | | | net/mlx5_core: Update device capabilities handlingEli Cohen2014-10-035-68/+103
| |/ / /
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2014-10-072-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | treewide: fix errors in printkMasanari Iida2014-09-011-1/+1
| * | | treewide: Fix typo in printkMasanari Iida2014-08-261-1/+1
* | | | Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/r...Linus Torvalds2014-09-2310-109/+200
|\ \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| *---. \ \ \ Merge branches 'core', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-nextRoland Dreier2014-09-2210-109/+200
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | | | * | | IB/qib: Correct reference counting in debugfs qp_statsMike Marciniszyn2014-09-192-9/+2
| | | | * | | IB/qib: Change get_user_pages() usage to always NULL vmasMike Marciniszyn2014-09-191-3/+3
| | | | * | | IB/ipath: Change get_user_pages() usage to always NULL vmasMike Marciniszyn2014-09-191-3/+3
| | |_|/ / / | |/| | | |
| | | * | | RDMA/ocrdma: Use right macro in query AHdevesh.sharma@emulex.com2014-09-221-1/+1
| | | * | | RDMA/ocrdma: Resolve L2 address when creating user AHdevesh.sharma@emulex.com2014-09-221-11/+30
| | | * | | RDMA/ocrdma: Do not skip setting deferred_armDevesh Sharma2014-09-191-3/+1
| | | * | | RDMA/ocrdma: Report correct value of max_fast_reg_page_list_lenDevesh Sharma2014-09-191-1/+1
| | |/ / / | |/| | |
| | * | | IB/mlx4: Fix VF mac handling in RoCEJack Morgenstein2014-09-222-11/+20
| | * | | IB/mlx4: Do not allow APM under RoCEJack Morgenstein2014-09-222-1/+21
| | * | | IB/mlx4: Don't update QP1 in native modeJack Morgenstein2014-09-221-0/+4
| | * | | IB/mlx4: Avoid accessing netdevice when building RoCE qp1 headerJack Morgenstein2014-09-223-16/+28
| | * | | IB/mlx4: Avoid executing gid task when device is being removedMoni Shoua2014-09-221-0/+9
| | * | | IB/mlx4: Fix lockdep splat for the iboe lockJack Morgenstein2014-09-221-12/+12
| | * | | IB/mlx4: Get upper dev addresses as RoCE GIDs when port comes upMoni Shoua2014-09-221-8/+17
| | * | | IB/mlx4: Reorder steps in RoCE GID table initializationMoni Shoua2014-09-221-12/+17
| | * | | IB/mlx4: Don't duplicate the default RoCE GIDMoni Shoua2014-09-221-0/+4