Subject: Re: [GIT] Networking

From: Yishai Hadas <[email-masked]>
Date: Mon, 21 Mar 2016 17:57:09 +0200

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 ?