David S. Miller e1ea2f9856 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Several conflicts here. NFP driver bug fix adding nfp_netdev_is_nfp_repr() check to nfp_fl_output() needed some adjustments because the code block is in an else block now. Parallel additions to net/pkt_cls.h and net/sch_generic.h A bug fix in __tcp_retransmit_skb() conflicted with some of the rbtree changes in net-next. The tc action RCU callback fixes in 'net' had some overlap with some of the recent tcf_block reworking. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-10-30 21:09:24 +09:00
..
act_api.c	net/sched: Set the net-device for egress device instance	2017-10-20 13:09:35 +01:00
act_bpf.c	bpf: rename bpf_compute_data_end into bpf_compute_data_pointers	2017-09-26 13:36:44 -07:00
act_connmark.c	net/sched: Change act_api and act_xxx modules to use IDR	2017-08-30 14:38:51 -07:00
act_csum.c	net/sched: Change act_api and act_xxx modules to use IDR	2017-08-30 14:38:51 -07:00
act_gact.c	net/sched: Change act_api and act_xxx modules to use IDR	2017-08-30 14:38:51 -07:00
act_ife.c	net_sched: fix a compile warning in act_ife	2017-10-14 18:43:45 -07:00
act_ipt.c	net/sched: Change act_api and act_xxx modules to use IDR	2017-08-30 14:38:51 -07:00
act_meta_mark.c	net sched actions: change IFE modules alias names	2017-10-12 22:13:20 -07:00
act_meta_skbprio.c	net sched actions: change IFE modules alias names	2017-10-12 22:13:20 -07:00
act_meta_skbtcindex.c	net sched actions: change IFE modules alias names	2017-10-12 22:13:20 -07:00
act_mirred.c	net: sched: make tc_action_ops->get_dev return dev and avoid passing net	2017-10-11 20:15:42 -07:00
act_nat.c	net/sched: Change act_api and act_xxx modules to use IDR	2017-08-30 14:38:51 -07:00
act_pedit.c	net/sched: Change act_api and act_xxx modules to use IDR	2017-08-30 14:38:51 -07:00
act_police.c	net/sched: Change act_api and act_xxx modules to use IDR	2017-08-30 14:38:51 -07:00
act_sample.c	net_sched: fix call_rcu() race on act_sample module removal	2017-10-29 22:49:31 +09:00
act_simple.c	net/sched: Change act_api and act_xxx modules to use IDR	2017-08-30 14:38:51 -07:00
act_skbedit.c	net/sched: Change act_api and act_xxx modules to use IDR	2017-08-30 14:38:51 -07:00
act_skbmod.c	net/sched: Change act_api and act_xxx modules to use IDR	2017-08-30 14:38:51 -07:00
act_tunnel_key.c	net/sched: Change act_api and act_xxx modules to use IDR	2017-08-30 14:38:51 -07:00
act_vlan.c	net/sched: Change act_api and act_xxx modules to use IDR	2017-08-30 14:38:51 -07:00
cls_api.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
cls_basic.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
cls_bpf.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
cls_cgroup.c	net_sched: use tcf_queue_work() in cgroup filter	2017-10-29 22:49:30 +09:00
cls_flow.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
cls_flower.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
cls_fw.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
cls_matchall.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
cls_route.c	net_sched: use tcf_queue_work() in route filter	2017-10-29 22:49:31 +09:00
cls_rsvp6.c
cls_rsvp.c
cls_rsvp.h	net_sched: use tcf_queue_work() in rsvp filter	2017-10-29 22:49:31 +09:00
cls_tcindex.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
cls_u32.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
em_canid.c	net: sched: remove tcf_proto from ematch calls	2014-10-06 18:02:32 -04:00
em_cmp.c
em_ipset.c	netfilter: x_tables: move hook state into xt_action_param structure	2016-11-03 10:56:21 +01:00
em_meta.c	net: convert sock.sk_refcnt from atomic_t to refcount_t	2017-07-01 07:39:08 -07:00
em_nbyte.c	net: sched: remove tcf_proto from ematch calls	2014-10-06 18:02:32 -04:00
em_text.c	net: Remove state argument from skb_find_text()	2015-02-22 15:59:54 -05:00
em_u32.c
ematch.c	net: sched: ematch: obtain net pointer from blocks	2017-10-16 21:00:40 +01:00
Kconfig	net/sched: Introduce Credit Based Shaper (CBS) qdisc	2017-10-27 09:48:02 -07:00
Makefile	net/sched: Introduce Credit Based Shaper (CBS) qdisc	2017-10-27 09:48:02 -07:00
sch_api.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
sch_atm.c	net: sched: store Qdisc pointer in struct block	2017-10-16 21:00:40 +01: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: mark expected switch fall-throughs	2017-10-22 02:07:08 +01:00
sch_cbs.c	net/sched: Add support for HW offloading for CBS	2017-10-27 09:49:24 -07:00
sch_choke.c	treewide: use kv[mz]alloc* rather than opencoded variants	2017-05-08 17:15:13 -07:00
sch_codel.c	netlink: pass extended ACK struct to parsing functions	2017-04-13 13:58:22 -04:00
sch_drr.c	net: sched: mark expected switch fall-throughs	2017-10-22 02:07:08 +01:00
sch_dsmark.c	net: sched: store Qdisc pointer in struct block	2017-10-16 21:00:40 +01:00
sch_fifo.c	sched: don't use skb queue helpers	2016-09-19 01:47:18 -04:00
sch_fq_codel.c	net: sched: mark expected switch fall-throughs	2017-10-22 02:07:08 +01:00
sch_fq.c	mm, tree wide: replace __GFP_REPEAT by __GFP_RETRY_MAYFAIL with more useful semantic	2017-07-12 16:26:03 -07:00
sch_generic.c	net/sched: Check for null dev_queue on create flow	2017-10-27 09:41:38 -07:00
sch_gred.c	netlink: pass extended ACK struct to parsing functions	2017-04-13 13:58:22 -04:00
sch_hfsc.c	net: sched: mark expected switch fall-throughs	2017-10-22 02:07:08 +01:00
sch_hhf.c	sch_hhf: fix null pointer dereference on init failure	2017-08-30 15:26:11 -07:00
sch_htb.c	net: sched: mark expected switch fall-throughs	2017-10-22 02:07:08 +01:00
sch_ingress.c	net: sched: use extended variants of block_get/put in ingress and clsact qdiscs	2017-10-21 03:04:06 +01:00
sch_mq.c	net/sched: Change behavior of mq select_queue()	2017-10-27 09:41:45 -07:00
sch_mqprio.c	net/sched: Add select_queue() class_ops for mqprio	2017-10-27 09:41:50 -07:00
sch_multiq.c	net: sched: mark expected switch fall-throughs	2017-10-22 02:07:08 +01:00
sch_netem.c	net: add rb_to_skb() and other rb tree helpers	2017-10-07 00:28:53 +01:00
sch_pie.c	net: sched: Convert timers to use timer_setup()	2017-10-18 12:39:54 +01: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	net: sched: mark expected switch fall-throughs	2017-10-22 02:07:08 +01:00
sch_qfq.c	net: sched: mark expected switch fall-throughs	2017-10-22 02:07:08 +01:00
sch_red.c	net: sched: Convert timers to use timer_setup()	2017-10-18 12:39:54 +01:00
sch_sfb.c	net: sched: mark expected switch fall-throughs	2017-10-22 02:07:08 +01:00
sch_sfq.c	net: sched: mark expected switch fall-throughs	2017-10-22 02:07:08 +01:00
sch_tbf.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-09-01 17:42:05 -07:00
sch_teql.c	net: make ndo_get_stats64 a void function	2017-01-08 17:51:44 -05:00