git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Mon, 3 Jul 2017 10:42:10 +0000 (03:42 -0700)
committer	David S. Miller <davem@davemloft.net>
	Mon, 3 Jul 2017 10:42:10 +0000 (03:42 -0700)
commit	5aaaac5f377d48e64e8081d2ac475f4b2c3ecbd0
tree	c089ee16fe465b94b473c92b834cab08ca57352d	tree \| snapshot
parent	6ad0116b289f6253273c9ca999c252cd9fecc134	commit \| diff
parent	70d5cb40287da6ba020a49bf5933259a611a137d	commit \| diff

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>

Linux Kernel Source Tree.

RSS Atom

drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/health.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/main.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/driver.h	diff1 \|	diff2 \|	blob \| history