diff options
author | Saeed Mahameed <saeedm@mellanox.com> | 2018-12-14 11:15:25 -0800 |
---|---|---|
committer | Saeed Mahameed <saeedm@mellanox.com> | 2018-12-14 11:15:25 -0800 |
commit | 64e4cf0dab16ad432fcbe7ac1109488e5a282c7b (patch) | |
tree | 66b70716f95e2c65e640d4652535310cf85a43bc /include/crypto/morus1280_glue.h | |
parent | 522185d5cb40fafeab807c1ff5ec4ad3a4688b0d (diff) | |
parent | 4c283e6155988486e2c83a2f273f919ecd3ce721 (diff) |
Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
mlx5-next shared branch with rdma subtree to avoid mlx5 rdma v.s. netdev
conflicts.
Highlights:
1) Lag refactroing and flow counter affinity bits.
2) mlx5 core cleanups
By Roi Dayan (2) and others
* 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux:
net/mlx5: Fold the modify lag code into function
net/mlx5: Add lag affinity info to log
net/mlx5: Split the activate lag function into two routines
net/mlx5: E-Switch, Introduce flow counter affinity
IB/mlx5: Unify e-switch representors load approach between uplink and VFs
net/mlx5: Use lowercase 'X' for hex values
net/mlx5: Remove duplicated include from eswitch.c
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Diffstat (limited to 'include/crypto/morus1280_glue.h')
0 files changed, 0 insertions, 0 deletions