Merge https://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 3 Jul 2017 10:42:10 +0000 (03:42 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 3 Jul 2017 10:42:10 +0000 (03:42 -0700)
commit3a3f7d130eb5c219a1a4b183b92106028747dc85
treec089ee16fe465b94b473c92b834cab08ca57352d
parent784c372a8184bdb8ae722c94250c2d57dc327a8e
parentea23b42739a2c3c1158344928048fff8c70d1f66
Merge https://git./linux/kernel/git/davem/net

Some overlapping changes in the mlx5 driver.

A merge conflict resolution posted by Stephen Rothwell was used as a
guide.

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlx5/core/health.c
drivers/net/ethernet/mellanox/mlx5/core/main.c
include/linux/mlx5/driver.h