From: David S. Miller <davem@davemloft.net>
Date: Sun, 16 Apr 2017 01:16:30 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.14-rc1~960^3~181
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b6cbc1471676402565e958674523d06213b82d7;p=platform%2Fkernel%2Flinux-rpi.git

Merge git://git./linux/kernel/git/davem/net

Conflicts were simply overlapping changes.  In the net/ipv4/route.c
case the code had simply moved around a little bit and the same fix
was made in both 'net' and 'net-next'.

In the net/sched/sch_generic.c case a fix in 'net' happened at
the same time that a new argument was added to qdisc_hash_add().

Signed-off-by: David S. Miller <davem@davemloft.net>
---

6b6cbc1471676402565e958674523d06213b82d7
diff --cc net/netfilter/nf_conntrack_expect.c
index cb29e59,d8007303..a5ca5e4
--- a/net/netfilter/nf_conntrack_expect.c
+++ b/net/netfilter/nf_conntrack_expect.c
@@@ -361,9 -361,9 +361,9 @@@ static void nf_ct_expect_insert(struct 
  	unsigned int h = nf_ct_expect_dst_hash(net, &exp->tuple);
  
  	/* two references : one for hash insert, one for the timer */
 -	atomic_add(2, &exp->use);
 +	refcount_add(2, &exp->use);
  
- 	hlist_add_head(&exp->lnode, &master_help->expectations);
+ 	hlist_add_head_rcu(&exp->lnode, &master_help->expectations);
  	master_help->expecting[exp->class]++;
  
  	hlist_add_head_rcu(&exp->hnode, &nf_ct_expect_hash[h]);
diff --cc net/sched/sch_generic.c
index 3e64d23,1a2f9e9..52a2c55
--- 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
  }