Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756781AbcCUP5R (ORCPT ); Mon, 21 Mar 2016 11:57:17 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:37935 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756598AbcCUP5O (ORCPT ); Mon, 21 Mar 2016 11:57:14 -0400 Subject: Re: [GIT] Networking To: David Miller References: <20160319.004247.586283396471702061.davem@davemloft.net> Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "yishaih@mellanox.com" , Majd Dibbiny From: Yishai Hadas Message-ID: <56F019D5.9040907@dev.mellanox.co.il> Date: Mon, 21 Mar 2016 17:57:09 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <20160319.004247.586283396471702061.davem@davemloft.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 239 Lines: 8 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 ?