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]:42814 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1752145AbeCWPlG (ORCPT
        <rfc822;netdev@vger.kernel.org>); Fri, 23 Mar 2018 11:41:06 -0400
Date: Fri, 23 Mar 2018 11:40:59 -0400 (EDT)
Message-Id: <20180323.114059.297397691681485266.davem@davemloft.net>
To: netdev@vger.kernel.org
CC: jgg@mellanox.com, dledford@redhat.com, idosch@mellanox.com,
        dsahern@gmail.com, sd@queasysnail.net
Subject: [GIT] 'net' merged into 'net-next'
From: David Miller <davem@davemloft.net>
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>


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.

Thank you.