David S. Miller 6abdd5f593 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-08-30 00:54:02 -04:00
..
act_api.c	net_sched: convert tcf_exts from list to pointer array	2016-08-17 19:27:51 -04:00
act_bpf.c	net_sched: move tc_action into tcf_common	2016-07-25 21:49:19 -07:00
act_connmark.c	net_sched: move tc_action into tcf_common	2016-07-25 21:49:19 -07:00
act_csum.c	net_sched: move tc_action into tcf_common	2016-07-25 21:49:19 -07:00
act_gact.c	net_sched: move tc_action into tcf_common	2016-07-25 21:49:19 -07:00
act_ife.c	net sched: fix encoding to use real length	2016-08-22 21:01:57 -07:00
act_ipt.c	net_sched: move tc_action into tcf_common	2016-07-25 21:49:19 -07:00
act_meta_mark.c	Support to encoding decoding skb mark on IFE action	2016-03-01 17:15:23 -05:00
act_meta_skbprio.c	Support to encoding decoding skb prio on IFE action	2016-03-01 17:15:23 -05:00
act_mirred.c	net_sched: move tc_action into tcf_common	2016-07-25 21:49:19 -07:00
act_nat.c	net_sched: move tc_action into tcf_common	2016-07-25 21:49:19 -07:00
act_pedit.c	net_sched: move tc_action into tcf_common	2016-07-25 21:49:19 -07:00
act_police.c	net_sched: allow flushing tc police actions	2016-08-17 19:27:51 -04:00
act_simple.c	net_sched: move tc_action into tcf_common	2016-07-25 21:49:19 -07:00
act_skbedit.c	net_sched: move tc_action into tcf_common	2016-07-25 21:49:19 -07:00
act_vlan.c	net_sched: act_vlan: Add priority option	2016-08-18 23:13:14 -07:00
cls_api.c	net_sched: convert tcf_exts from list to pointer array	2016-08-17 19:27:51 -04:00
cls_basic.c	net_sched: properly handle failure case of tcf_exts_init()	2016-08-22 17:02:31 -07:00
cls_bpf.c	net_sched: properly handle failure case of tcf_exts_init()	2016-08-22 17:02:31 -07:00
cls_cgroup.c	net_sched: properly handle failure case of tcf_exts_init()	2016-08-22 17:02:31 -07:00
cls_flow.c	net_sched: properly handle failure case of tcf_exts_init()	2016-08-22 17:02:31 -07:00
cls_flower.c	net_sched: fix use of uninitialized ethertype variable in cls_flower	2016-08-29 00:30:23 -04:00
cls_fw.c	net_sched: properly handle failure case of tcf_exts_init()	2016-08-22 17:02:31 -07:00
cls_matchall.c	net/sched: Add match-all classifier hw offloading.	2016-07-24 23:11:59 -07:00
cls_route.c	net_sched: properly handle failure case of tcf_exts_init()	2016-08-22 17:02:31 -07:00
cls_rsvp6.c
cls_rsvp.c
cls_rsvp.h	net_sched: properly handle failure case of tcf_exts_init()	2016-08-22 17:02:31 -07:00
cls_tcindex.c	net_sched: properly handle failure case of tcf_exts_init()	2016-08-22 17:02:31 -07:00
cls_u32.c	net_sched: properly handle failure case of tcf_exts_init()	2016-08-22 17:02:31 -07:00
em_canid.c
em_cmp.c
em_ipset.c
em_meta.c	qdisc: constify meta_type_ops structures	2016-04-14 00:35:30 -04:00
em_nbyte.c
em_text.c
em_u32.c
ematch.c
Kconfig	net/sched: introduce Match-all classifier	2016-07-24 23:11:59 -07:00
Makefile	net/sched: introduce Match-all classifier	2016-07-24 23:11:59 -07:00
sch_api.c	net: sched: avoid duplicates in qdisc dump	2016-08-18 21:19:08 -07:00
sch_atm.c	net_sched: drop packets after root qdisc lock is released	2016-06-25 12:19:35 -04:00
sch_blackhole.c	net_sched: drop packets after root qdisc lock is released	2016-06-25 12:19:35 -04:00
sch_cbq.c	net_sched: drop packets after root qdisc lock is released	2016-06-25 12:19:35 -04:00
sch_choke.c	net_sched: drop packets after root qdisc lock is released	2016-06-25 12:19:35 -04:00
sch_codel.c	net_sched: drop packets after root qdisc lock is released	2016-06-25 12:19:35 -04:00
sch_drr.c	net_sched: drop packets after root qdisc lock is released	2016-06-25 12:19:35 -04:00
sch_dsmark.c	net_sched: drop packets after root qdisc lock is released	2016-06-25 12:19:35 -04:00
sch_fifo.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-06-30 05:03:36 -04:00
sch_fq_codel.c	net_sched: fq_codel: cache skb->truesize into skb->cb	2016-06-25 12:19:35 -04:00
sch_fq.c	net_sched: drop packets after root qdisc lock is released	2016-06-25 12:19:35 -04:00
sch_generic.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-08-30 00:54:02 -04:00
sch_gred.c	net_sched: drop packets after root qdisc lock is released	2016-06-25 12:19:35 -04:00
sch_hfsc.c	net/sched/sch_hfsc.c: remove unused cl_myfadj	2016-08-08 16:06:47 -07:00
sch_hhf.c	net_sched: drop packets after root qdisc lock is released	2016-06-25 12:19:35 -04:00
sch_htb.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-07-24 00:53:32 -04:00
sch_ingress.c	net: sched: fix tc_should_offload for specific clsact classes	2016-06-07 16:59:53 -07:00
sch_mq.c	net: sched: convert qdisc linked list to hashtable	2016-08-10 17:19:02 -07:00
sch_mqprio.c	net: sched: convert qdisc linked list to hashtable	2016-08-10 17:19:02 -07:00
sch_multiq.c	net_sched: drop packets after root qdisc lock is released	2016-06-25 12:19:35 -04:00
sch_netem.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-06-30 05:03:36 -04:00
sch_pie.c	net_sched: drop packets after root qdisc lock is released	2016-06-25 12:19:35 -04:00
sch_plug.c	net_sched: drop packets after root qdisc lock is released	2016-06-25 12:19:35 -04:00
sch_prio.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-06-30 05:03:36 -04:00
sch_qfq.c	net_sched: drop packets after root qdisc lock is released	2016-06-25 12:19:35 -04:00
sch_red.c	net_sched: drop packets after root qdisc lock is released	2016-06-25 12:19:35 -04:00
sch_sfb.c	net_sched: drop packets after root qdisc lock is released	2016-06-25 12:19:35 -04:00
sch_sfq.c	net_sched: drop packets after root qdisc lock is released	2016-06-25 12:19:35 -04:00
sch_tbf.c	net_sched: drop packets after root qdisc lock is released	2016-06-25 12:19:35 -04:00
sch_teql.c	net_sched: drop packets after root qdisc lock is released	2016-06-25 12:19:35 -04:00