From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <netdev-owner@vger.kernel.org>
Received: from mail-eopbgr00089.outbound.protection.outlook.com ([40.107.0.89]:45600
        "EHLO EUR02-AM5-obe.outbound.protection.outlook.com"
        rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP
        id S1751691AbeCWSGH (ORCPT <rfc822;netdev@vger.kernel.org>);
        Fri, 23 Mar 2018 14:06:07 -0400
Date: Fri, 23 Mar 2018 21:05:59 +0300
From: Ido Schimmel <idosch@mellanox.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, jgg@mellanox.com, dledford@redhat.com,
        dsahern@gmail.com, sd@queasysnail.net
Subject: Re: [GIT] 'net' merged into 'net-next'
Message-ID: <20180323180559.GA29672@splinter>
References: <20180323.114059.297397691681485266.davem@davemloft.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20180323.114059.297397691681485266.davem@davemloft.net>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

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.

Fixup for mlxsw:
http://patchwork.ozlabs.org/patch/890093/