Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-01-05 11:03:07 -05:00
parent 57ea884b0d e02003b515
commit 76eb75be79
103 changed files with 902 additions and 670 deletions
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -125,7 +125,6 @@ enum {
 	MLX5_REG_HOST_ENDIANNESS = 0x7004,
 	MLX5_REG_MCIA		 = 0x9014,
 	MLX5_REG_MLCR		 = 0x902b,
-	MLX5_REG_MPCNT		 = 0x9051,
 };

 enum mlx5_dcbx_oper_mode {