Re: net merged into net-next

[Saeed Mahameed]

Dave,

The resolution of the mlx5_ifc conflict was wrong and it causes a build break 
in mlx5, oops :(.

I hope my resolution instructions in my pull request didn't mislead you.

I will post a patch.

-Saeed.