From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <netdev-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([184.105.139.130]:44518 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751903AbeCWRgT (ORCPT
        <rfc822;netdev@vger.kernel.org>); Fri, 23 Mar 2018 13:36:19 -0400
Date: Fri, 23 Mar 2018 13:36:16 -0400 (EDT)
Message-Id: <20180323.133616.109678949206778090.davem@davemloft.net>
To: jgg@mellanox.com
Cc: netdev@vger.kernel.org, dledford@redhat.com, idosch@mellanox.com,
        dsahern@gmail.com, sd@queasysnail.net
Subject: Re: [GIT] 'net' merged into 'net-next'
From: David Miller <davem@davemloft.net>
In-Reply-To: <20180323172622.GC13003@mellanox.com>
References: <20180323.114059.297397691681485266.davem@davemloft.net>
        <20180323172622.GC13003@mellanox.com>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: Jason Gunthorpe <jgg@mellanox.com>
Date: Fri, 23 Mar 2018 11:26:22 -0600

> On Fri, Mar 23, 2018 at 11:40:59AM -0400, David Miller wrote:
>> 
>> This merge was a little bit more hectic than usual.
>> 
>> But thankfully, I had some sample conflict resolutions to work
>> with, in particular for the mlx5 infiniband changes which were
>> the most difficult to resolve.
>> 
>> Please double check my work and provide any fixup patches if
>> necessary.
> 
> The drivers/infiniband looks OK, and I also checked that merging
> netdev and rdma together gets us to the right result.

Thanks for looking at it.