tree c089ee16fe465b94b473c92b834cab08ca57352d
parent 784c372a8184bdb8ae722c94250c2d57dc327a8e
parent ea23b42739a2c3c1158344928048fff8c70d1f66
author David S. Miller <davem@davemloft.net> 1499078530 -0700
committer David S. Miller <davem@davemloft.net> 1499078530 -0700

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>