From mboxrd@z Thu Jan  1 00:00:00 1970
From: Yishai Hadas <yishaih@dev.mellanox.co.il>
Subject: Re: [GIT] Networking
Date: Mon, 21 Mar 2016 17:57:09 +0200
Message-ID: <56F019D5.9040907@dev.mellanox.co.il>
References: <20160319.004247.586283396471702061.davem@davemloft.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	"yishaih@mellanox.com" <yishaih@mellanox.com>,
	Majd Dibbiny <majd@mellanox.com>
To: David Miller <davem@davemloft.net>
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20160319.004247.586283396471702061.davem@davemloft.net>
Sender: linux-kernel-owner@vger.kernel.org
List-Id: netdev.vger.kernel.org

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 ?