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

[Mark Brown]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  include/net/sch_generic.h

between commit:

  a6bd339dbb351 ("net_sched: fix skb memory leak in deferred qdisc drops")

from the net tree and commit:

  ff2998f29f390 ("net: sched: introduce qdisc-specific drop reason tracing")

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.

diff --cc include/net/sch_generic.h
index 5fc0b1ebaf25c,5af262ec4bbd2..0000000000000
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@@ -1168,24 -1185,14 +1185,24 @@@ static inline void tcf_kfree_skb_list(s
  }
  
  static inline void qdisc_dequeue_drop(struct Qdisc *q, struct sk_buff *skb,
- 				      enum skb_drop_reason reason)
+ 				      enum qdisc_drop_reason reason)
  {
 +	struct Qdisc *root;
 +
  	DEBUG_NET_WARN_ON_ONCE(!(q->flags & TCQ_F_DEQUEUE_DROPS));
  	DEBUG_NET_WARN_ON_ONCE(q->flags & TCQ_F_NOLOCK);
  
 -	tcf_set_qdisc_drop_reason(skb, reason);
 -	skb->next = q->to_free;
 -	q->to_free = skb;
 +	rcu_read_lock();
 +	root = qdisc_root_sleeping(q);
 +
 +	if (root->flags & TCQ_F_DEQUEUE_DROPS) {
- 		tcf_set_drop_reason(skb, reason);
++		tcf_set_qdisc_drop_reason(skb, reason);
 +		skb->next = root->to_free;
 +		root->to_free = skb;
 +	} else {
 +		kfree_skb_reason(skb, (enum skb_drop_reason)reason);
 +	}
 +	rcu_read_unlock();
  }
  
  /* Instead of calling kfree_skb() while root qdisc lock is held,

Attachment: signature.asc
Description: PGP signature