linux-next: manual merge of the net-next tree with the net tree

Path	csiph.com!fu-berlin.de!bofh.it!news.nic.it!robomod
From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the net-next tree with the net tree
Date	Fri, 07 Apr 2017 02:20:01 +0200
Message-ID	<ttpN7-84a-9@gated-at.bofh.it> (permalink)
X-Original-To	David Miller <davem@davemloft.net>, Networking <netdev@vger.kernel.org>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1491523923; bh=Nuaa3Bt9v90SjPWqDGm8+kCl/tY0gRWVpsnMDE2QlmM=; h=Date:From:To:Cc:Subject:From; b=PCz7wnbeKRbHo1xtsPKO9dQUJt+spiOedME6kGcT4Jzx6+fvDpFWhawD5Bj34bu/C m6OT4n61qPb/m/da8n+6sxprLCTUxuuSgzXXDR4TbfOMBrEalOXfR7erga36RerC4n Ocop1tOtyCR0D0s8Eo961QzKJBZbYPCVTj0s5VhABCGDv7VaqMOHVXXDLK/hJMYU7u ZxeaBKn51WH9dfTGg0hzJ4nYHU4npe6SrnZHC08rihLul03QkWluauXYxj8Mbip91w JETNHxgCgGkagNjzgHNfOODU0XH4Mi3hQl+xwBJcjckWHX3YvAaAc/ps4WzV3TJOOW zp17q5CTZFrzw==
MIME-Version	1.0
Content-Type	text/plain; charset=US-ASCII
Content-Transfer-Encoding	7bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	42
Organization	linux.* mail to news gateway
X-Original-Cc	Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Cong Wang <xiyou.wangcong@gmail.com>, Jiri Kosina <jkosina@suse.cz>
X-Original-Date	Fri, 7 Apr 2017 10:12:02 +1000
X-Original-Message-ID	<20170407101202.30ec5a4e@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1618419

Show key headers only | View raw

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
  }

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the net-next tree with the net tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-07 02:20 +0200
  Re: linux-next: manual merge of the net-next tree with the net tree Cong Wang <xiyou.wangcong@gmail.com> - 2017-04-07 17:50 +0200

csiph-web