From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-eopbgr30070.outbound.protection.outlook.com ([40.107.3.70]:52144 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751668AbeCWR0c (ORCPT ); Fri, 23 Mar 2018 13:26:32 -0400 Date: Fri, 23 Mar 2018 11:26:22 -0600 From: Jason Gunthorpe To: David Miller 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' Message-ID: <20180323172622.GC13003@mellanox.com> 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: 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. Jason