summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/mlx4
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2017-07-27 02:13:33 +0200
committerDoug Ledford <dledford@redhat.com>2017-07-27 02:13:33 +0200
commitf55c1e6608bed7f583f5be4a74bbca16b288a7e5 (patch)
treeefb77a548ab0bff0a82439999b3adef0983cafe2 /drivers/infiniband/hw/mlx4
parentMerge branch 'hfi1' into k.o/for-4.14 (diff)
parentIB/rxe: Constify static rxe_vm_ops (diff)
parentIB/mlx4: Expose RSS capabilities (diff)
downloadlinux-f55c1e6608bed7f583f5be4a74bbca16b288a7e5.tar.xz
linux-f55c1e6608bed7f583f5be4a74bbca16b288a7e5.zip
Merge branches 'rxe' and 'mlx' into k.o/for-next