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