David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of conflicts, by happily all cases of overlapping changes, parallel adds, things of that nature. Thanks to Stephen Rothwell, Saeed Mahameed, and others for their guidance in these resolutions. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-12-20 11:53:36 -08:00
..
act_api.c	net/sched: Remove egdev mechanism	2018-12-10 15:54:34 -08:00
act_bpf.c
act_connmark.c
act_csum.c
act_gact.c	net/sched: act_gact: disallow 'goto chain' on fallback control action	2018-10-22 19:40:55 -07:00
act_ife.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-09-04 21:33:03 -07:00
act_ipt.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-10-03 21:00:17 -07:00
act_meta_mark.c
act_meta_skbprio.c
act_meta_skbtcindex.c
act_mirred.c	act_mirred: clear skb->tstamp on redirect	2018-11-11 10:21:31 -08:00
act_nat.c	net: sched: act_nat: remove dependency on rtnl lock	2018-09-08 10:18:25 -07:00
act_pedit.c	net/sched: act_pedit: fix memory leak when IDR allocation fails	2018-11-16 19:53:45 -08:00
act_police.c	net/sched: act_police: fix memory leak in case of invalid control action	2018-11-30 17:14:06 -08:00
act_sample.c	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-09-18 09:33:27 -07:00
act_simple.c
act_skbedit.c	net: sched: act_skbedit: remove dependency on rtnl lock	2018-09-08 10:17:35 -07:00
act_skbmod.c
act_tunnel_key.c	net/sched: act_tunnel_key: Don't dump dst port if it wasn't set	2018-12-04 20:53:37 -08:00
act_vlan.c	net/core: use __vlan_hwaccel helpers	2018-11-08 20:45:04 -08:00
cls_api.c	net_sched: fold tcf_block_cb_call() into tc_setup_cb_call()	2018-12-14 15:32:19 -08:00
cls_basic.c
cls_bpf.c	net_sched: fold tcf_block_cb_call() into tc_setup_cb_call()	2018-12-14 15:32:19 -08:00
cls_cgroup.c
cls_flow.c
cls_flower.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-20 11:53:36 -08:00
cls_fw.c
cls_matchall.c	net_sched: fold tcf_block_cb_call() into tc_setup_cb_call()	2018-12-14 15:32:19 -08:00
cls_route.c
cls_rsvp6.c
cls_rsvp.c
cls_rsvp.h
cls_tcindex.c
cls_u32.c	net_sched: fold tcf_block_cb_call() into tc_setup_cb_call()	2018-12-14 15:32:19 -08:00
em_canid.c
em_cmp.c
em_ipset.c
em_ipt.c
em_meta.c
em_nbyte.c
em_text.c
em_u32.c
ematch.c
Kconfig	tc: Add support for configuring the taprio scheduler	2018-10-04 13:52:23 -07:00
Makefile	tc: Add support for configuring the taprio scheduler	2018-10-04 13:52:23 -07:00
sch_api.c	net: sched: simplify the qdisc_leaf code	2018-12-15 11:37:32 -08:00
sch_atm.c	net: sched: rename qdisc_destroy() to qdisc_put()	2018-09-25 20:17:35 -07:00
sch_blackhole.c
sch_cake.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-10-12 21:38:46 -07:00
sch_cbq.c	net: sched: rename qdisc_destroy() to qdisc_put()	2018-09-25 20:17:35 -07:00
sch_cbs.c	net: sched: rename qdisc_destroy() to qdisc_put()	2018-09-25 20:17:35 -07:00
sch_choke.c
sch_codel.c
sch_drr.c	net: sched: rename qdisc_destroy() to qdisc_put()	2018-09-25 20:17:35 -07:00
sch_dsmark.c	net: sched: rename qdisc_destroy() to qdisc_put()	2018-09-25 20:17:35 -07:00
sch_etf.c	etf: Drop all expired packets	2018-11-16 20:39:34 -08:00
sch_fifo.c	net: sched: rename qdisc_destroy() to qdisc_put()	2018-09-25 20:17:35 -07:00
sch_fq_codel.c	net: Add and use skb_mark_not_on_list().	2018-09-10 10:06:54 -07:00
sch_fq.c	net_sched: sch_fq: avoid calling ktime_get_ns() if not needed	2018-11-20 09:51:32 -08:00
sch_generic.c	net: sched: avoid writing on noop_qdisc	2018-10-10 22:49:16 -07:00
sch_gred.c	net: sched: gred: support reporting stats from offloads	2018-11-19 18:53:46 -08:00
sch_hfsc.c	net: sched: rename qdisc_destroy() to qdisc_put()	2018-09-25 20:17:35 -07:00
sch_hhf.c	net: Add and use skb_mark_not_on_list().	2018-09-10 10:06:54 -07:00
sch_htb.c	net: sched: rename qdisc_destroy() to qdisc_put()	2018-09-25 20:17:35 -07:00
sch_ingress.c
sch_mq.c	net: sched: mq: offload a graft notification	2018-11-14 08:51:28 -08:00
sch_mqprio.c	net: sched: rename qdisc_destroy() to qdisc_put()	2018-09-25 20:17:35 -07:00
sch_multiq.c	net: sched: rename qdisc_destroy() to qdisc_put()	2018-09-25 20:17:35 -07:00
sch_netem.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-09 21:43:31 -08:00
sch_pie.c	net: sched: pie: fix coding style issues	2018-10-07 20:39:01 -07:00
sch_plug.c
sch_prio.c	net: sched: prio: delay destroying child qdiscs on change	2018-11-08 16:19:48 -08:00
sch_qfq.c	net: sched: rename qdisc_destroy() to qdisc_put()	2018-09-25 20:17:35 -07:00
sch_red.c	net: sched: red: notify drivers about RED's limit parameter	2018-11-14 08:51:28 -08:00
sch_sfb.c	net: sched: rename qdisc_destroy() to qdisc_put()	2018-09-25 20:17:35 -07:00
sch_sfq.c
sch_skbprio.c
sch_taprio.c	tc: Add support for configuring the taprio scheduler	2018-10-04 13:52:23 -07:00
sch_tbf.c	net: sched: rename qdisc_destroy() to qdisc_put()	2018-09-25 20:17:35 -07:00
sch_teql.c