From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933192AbdDGAMO (ORCPT ); Thu, 6 Apr 2017 20:12:14 -0400 Received: from ozlabs.org ([103.22.144.67]:48205 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755677AbdDGAMF (ORCPT ); Thu, 6 Apr 2017 20:12:05 -0400 Date: Fri, 7 Apr 2017 10:12:02 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Cong Wang , Jiri Kosina Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20170407101202.30ec5a4e@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/sched/sch_generic.c between commit: 92f9170621a1 ("net_sched: check noop_qdisc before qdisc_hash_add()") from the net tree and commit: 49b499718fa1 ("net: sched: make default fifo qdiscs appear in the dump") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/sched/sch_generic.c index 1a2f9e964330,3e64d23e098c..000000000000 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@@ -794,8 -794,8 +794,8 @@@ static void attach_default_qdiscs(struc } } #ifdef CONFIG_NET_SCHED - if (dev->qdisc) + if (dev->qdisc != &noop_qdisc) - qdisc_hash_add(dev->qdisc); + qdisc_hash_add(dev->qdisc, false); #endif }