From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932393AbcJTGhk (ORCPT ); Thu, 20 Oct 2016 02:37:40 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:39510 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752941AbcJTGhi (ORCPT ); Thu, 20 Oct 2016 02:37:38 -0400 X-Sasl-enc: r9g3kBFzOsiGtlbjBr0BN86R0XpVSva6KWdHV2EMpEJ8 1476945456 Date: Thu, 20 Oct 2016 09:37:35 +0300 From: Ido Schimmel To: Stephen Rothwell Cc: David Miller , Networking , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ido Schimmel , David Ahern Subject: Re: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20161020063735.GA16644@splinter> References: <20161020110142.41162709@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161020110142.41162709@canb.auug.org.au> User-Agent: Mutt/1.7.0 (2016-08-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Oct 20, 2016 at 11:01:42AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got conflicts in: > > include/linux/netdevice.h > net/core/dev.c > > between commit: > > e4961b076885 ("net: core: Correctly iterate over lower adjacency list") > > from the net tree and commit: > > 1a3f060c1a47 ("net: Introduce new api for walking upper and lower devices") > f1170fd462c6 ("net: Remove all_adj_list and its references") > > from the net-next tree. > > I fixed it up (I just used the net-next tree version) and can carry the > fix as necessary. Yes, net-next is correct. Thanks Stephen!