David S. Miller 0b42f25d2f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... udplite conflict is resolved by taking what 'net-next' did which removed the backlog receive method assignment, since it is no longer necessary. Two entries were added to the non-priv ethtool operations switch statement, one in 'net' and one in 'net-next, so simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-11-26 23:42:21 -05:00
..
act_api.c	net_sched actions: use nla_parse_nested()	2016-10-29 15:01:01 -04:00
act_bpf.c	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
act_connmark.c	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
act_csum.c	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
act_gact.c	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
act_ife.c	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
act_ipt.c	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
act_meta_mark.c
act_meta_skbprio.c
act_meta_skbtcindex.c	net sched ife action: Introduce skb tcindex metadata encap decap	2016-09-19 21:55:28 -04:00
act_mirred.c	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
act_nat.c	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
act_pedit.c	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
act_police.c	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
act_simple.c	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
act_skbedit.c	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
act_skbmod.c	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
act_tunnel_key.c	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
act_vlan.c	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
cls_api.c	net sched filters: fix filter handle ID in tfilter_notify_chain()	2016-11-24 16:05:58 -05: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	netlink: Add nla_memdup() to wrap kmemdup() use on nlattr	2016-10-29 14:57:42 -04: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: stylistic cleanups	2016-09-19 22:04:14 -04:00
cls_flower.c	net/sched: cls_flower: Add UDP port to tunnel parameters	2016-11-09 13:41:54 -05:00
cls_fw.c	net sched: stylistic cleanups	2016-09-19 22:04:14 -04:00
cls_matchall.c
cls_route.c	net_sched: check NULL on error path in route4_change()	2016-09-23 06:51:49 -04:00
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_rsvp6.c
cls_tcindex.c	net sched: stylistic cleanups	2016-09-19 22:04:14 -04:00
cls_u32.c	net sched: stylistic cleanups	2016-09-19 22:04:14 -04:00
em_canid.c
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/sched: em_meta: Fix 'meta vlan' to correctly recognize zero VID frames	2016-10-23 17:31:25 -04:00
em_nbyte.c
em_text.c
em_u32.c
ematch.c
Kconfig	net sched ife action: Introduce skb tcindex metadata encap decap	2016-09-19 21:55:28 -04:00
Makefile	net sched ife action: Introduce skb tcindex metadata encap decap	2016-09-19 21:55:28 -04:00
sch_api.c	qdisc: catch misconfig of attaching qdisc to tx_queue_len zero device	2016-11-07 20:15:55 -05:00
sch_atm.c
sch_blackhole.c
sch_cbq.c
sch_choke.c
sch_codel.c	sched: replace __skb_dequeue with __qdisc_dequeue_head	2016-09-19 01:47:18 -04:00
sch_drr.c
sch_dsmark.c
sch_fifo.c	sched: don't use skb queue helpers	2016-09-19 01:47:18 -04:00
sch_fq.c	net_sched: sch_fq: use hash_ptr()	2016-11-17 13:28:56 -05:00
sch_fq_codel.c
sch_generic.c	sched: add and use qdisc_skb_head helpers	2016-09-19 01:47:18 -04:00
sch_gred.c
sch_hfsc.c	net/sched/sch_hfsc.c: remove unused cl_myfadj	2016-08-08 16:06:47 -07:00
sch_hhf.c
sch_htb.c	sch_htb: do not report fake rate estimators	2016-10-26 17:13:49 -04:00
sch_ingress.c
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
sch_netem.c	sched: add and use qdisc_skb_head helpers	2016-09-19 01:47:18 -04:00
sch_pie.c	sched: replace __skb_dequeue with __qdisc_dequeue_head	2016-09-19 01:47:18 -04:00
sch_plug.c
sch_prio.c
sch_qfq.c	sch_qfq: keep backlog updated with qlen	2016-09-23 06:52:31 -04:00
sch_red.c
sch_sfb.c	sch_sfb: keep backlog updated with qlen	2016-09-23 06:52:31 -04:00
sch_sfq.c
sch_tbf.c
sch_teql.c	net: use core MTU range checking in core net infra	2016-10-20 14:51:09 -04:00