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	96ef1aca59bb507e78b58e73e635b1fd7d017edc
tree	c089ee16fe465b94b473c92b834cab08ca57352d	tree \| snapshot
parent	0436fc6eafe2f8a10dc925b0b4693fba57bc860d	commit \| diff
parent	d83bba1349f4eddde0e1cb51f14f2750aad793b5	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