Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox...
authorSaeed Mahameed <saeedm@mellanox.com>
Mon, 23 Jul 2018 21:58:46 +0000 (14:58 -0700)
committerSaeed Mahameed <saeedm@mellanox.com>
Mon, 23 Jul 2018 21:58:46 +0000 (14:58 -0700)
commit7854ac44fe86548f8a6c6001938a1a2593b255e4
treedc0a0fb20902d4c25c9a39b1a14679ce9faa7738
parentc9eaaa1773982e30fcb6e9f2e2db878490c0f730
parent048f31437ac5da336cf08e13f5fdc8add6a9bb16
Merge branch 'mlx5-next' of git://git./linux/kernel/git/mellanox/linux

mlx5 core infrastructure updates and fixes.

From Eran:
 - Add MPEGC (Management PCIe General Configuration) registers and btis
 - Fix tristate and description for MLX5 module

rom Feras:
 - Add hardware structures for the firmware tracer

From Jainbo:
 - Core support for double vlan push/pop steering action

From Max:
 - Add XRQ commands definitions

From Noa:
 - Add missing SET_DRIVER_VERSION command translation

From Roi:
 - Use ERR_CAST() instead of coding it

From Tariq:
 - Better return types for CQE API

Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
drivers/net/ethernet/mellanox/mlx5/core/cmd.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
include/linux/mlx5/mlx5_ifc.h