Re: [GIT] Networking

From: Yishai Hadas
Date: Mon Mar 21 2016 - 11:57:20 EST

On 3/19/2016 6:42 AM, David Miller wrote:

There is a merge conflict against the RDMA tree pull wrt the mlx4 driver,
which I don't know how to resolve.

Can you please point on the conflict ? is it still open that needs our input ?