diff options
| author | Jason Gunthorpe <jgg@mellanox.com> | 2020-01-16 15:54:22 -0400 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2020-01-16 15:54:22 -0400 |
| commit | f862308579752c75f491d6d84948d1befc29514d (patch) | |
| tree | 3496c6cdba7f82c9be657783975f0c7717f529f5 /drivers/infiniband/core/uverbs_main.c | |
| parent | 0fbb37dd82998b5c83355997b3bdba2806968ac7 (diff) | |
| parent | a880a6dd853713e02a2804dd7ecaf39c7d3d9b18 (diff) | |
| download | linux-stable-f862308579752c75f491d6d84948d1befc29514d.tar.gz linux-stable-f862308579752c75f491d6d84948d1befc29514d.tar.bz2 linux-stable-f862308579752c75f491d6d84948d1befc29514d.zip | |
Merge branch 'mlx5-next' into rdma.git for-next
From the mlx5-next branch at
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
Merged due to dependencies in the next patches.
* branch 'mlx5-next':
net/mlx5: Expose relaxed ordering bits
net/mlx5: Add RoCE accelerator counters
Diffstat (limited to 'drivers/infiniband/core/uverbs_main.c')
0 files changed, 0 insertions, 0 deletions