Merge conflict of mlx5 resolved using instructions in merge commit 9566e650bf. Signed-off-by: David S. Miller <davem@davemloft.net>
9566e650bf