]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5aaaac5f377d48e64e8081d2ac475f4b2c3ecbd0
treec089ee16fe465b94b473c92b834cab08ca57352d
parent6ad0116b289f6253273c9ca999c252cd9fecc134
parent70d5cb40287da6ba020a49bf5933259a611a137d
Merge https://git.kernel.org/pub/scm/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