projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0fbb37d a880a6d)
Merge branch 'mlx5-next' into rdma.git for-next
authorJason Gunthorpe <jgg@mellanox.com>
Thu, 16 Jan 2020 19:54:22 +0000 (15:54 -0400)
committerJason Gunthorpe <jgg@mellanox.com>
Thu, 16 Jan 2020 19:54:22 +0000 (15:54 -0400)
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


Trivial merge