David S. Miller 0f3e9c97eb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... All of the conflicts were cases of overlapping changes. In net/core/devlink.c, we have to make care that the resouce size_params have become a struct member rather than a pointer to such an object. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-03-06 01:20:46 -05:00
..
act_api.c	net sched actions: corrected extack message	2018-03-05 10:19:29 -05:00
act_bpf.c	net: Convert tc_action_net_init() and tc_action_net_exit() based pernet_operations	2018-02-27 11:01:36 -05:00
act_connmark.c	net: Convert tc_action_net_init() and tc_action_net_exit() based pernet_operations	2018-02-27 11:01:36 -05:00
act_csum.c	net: Convert tc_action_net_init() and tc_action_net_exit() based pernet_operations	2018-02-27 11:01:36 -05:00
act_gact.c	net: Convert tc_action_net_init() and tc_action_net_exit() based pernet_operations	2018-02-27 11:01:36 -05:00
act_ife.c	net: Convert tc_action_net_init() and tc_action_net_exit() based pernet_operations	2018-02-27 11:01:36 -05:00
act_ipt.c	net: Convert tc_action_net_init() and tc_action_net_exit() based pernet_operations	2018-02-27 11:01:36 -05:00
act_meta_mark.c	net: remove duplicate includes	2017-12-13 13:18:46 -05: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: remove duplicate includes	2017-12-13 13:18:46 -05:00
act_mirred.c	net: Convert tc_action_net_init() and tc_action_net_exit() based pernet_operations	2018-02-27 11:01:36 -05:00
act_nat.c	net: Convert tc_action_net_init() and tc_action_net_exit() based pernet_operations	2018-02-27 11:01:36 -05:00
act_pedit.c	net: Convert tc_action_net_init() and tc_action_net_exit() based pernet_operations	2018-02-27 11:01:36 -05:00
act_police.c	net: Convert tc_action_net_init() and tc_action_net_exit() based pernet_operations	2018-02-27 11:01:36 -05:00
act_sample.c	net: Convert tc_action_net_init() and tc_action_net_exit() based pernet_operations	2018-02-27 11:01:36 -05:00
act_simple.c	net: Convert tc_action_net_init() and tc_action_net_exit() based pernet_operations	2018-02-27 11:01:36 -05:00
act_skbedit.c	net: Convert tc_action_net_init() and tc_action_net_exit() based pernet_operations	2018-02-27 11:01:36 -05:00
act_skbmod.c	net: Convert tc_action_net_init() and tc_action_net_exit() based pernet_operations	2018-02-27 11:01:36 -05:00
act_tunnel_key.c	net: Convert tc_action_net_init() and tc_action_net_exit() based pernet_operations	2018-02-27 11:01:36 -05:00
act_vlan.c	net: Convert tc_action_net_init() and tc_action_net_exit() based pernet_operations	2018-02-27 11:01:36 -05:00
cls_api.c	net: Convert simple pernet_operations	2018-02-27 11:01:35 -05:00
cls_basic.c	cls_basic: Convert to use idr_alloc_u32	2018-02-06 16:41:26 -05:00
cls_bpf.c	cls_bpf: Convert to use idr_alloc_u32	2018-02-06 16:41:26 -05:00
cls_cgroup.c	net: sched: propagate extack to cls->destroy callbacks	2018-01-24 16:01:09 -05:00
cls_flow.c	net: sched: propagate extack to cls->destroy callbacks	2018-01-24 16:01:09 -05:00
cls_flower.c	cls_flower: Convert to idr_alloc_u32	2018-02-06 16:41:26 -05:00
cls_fw.c	net: sched: propagate extack to cls->destroy callbacks	2018-01-24 16:01:09 -05:00
cls_matchall.c	cls_matchall: propagate extack to delete callback	2018-01-24 16:01:10 -05:00
cls_route.c	net: sched: propagate extack to cls->destroy callbacks	2018-01-24 16:01:09 -05:00
cls_rsvp.c
cls_rsvp.h	net: sched: propagate extack to cls->destroy callbacks	2018-01-24 16:01:09 -05:00
cls_rsvp6.c
cls_tcindex.c	net: sched: propagate extack to cls->destroy callbacks	2018-01-24 16:01:09 -05:00
cls_u32.c	net: sched: fix tc_u_common lookup	2018-02-13 12:29:02 -05: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_ipt.c	net: sched: add em_ipt ematch for calling xtables matches	2018-02-21 13:15:33 -05: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: em_nbyte: don't add the data offset twice	2018-01-24 14:52:40 -05:00
em_text.c
em_u32.c
ematch.c	net: sched: ematch: obtain net pointer from blocks	2017-10-16 21:00:40 +01:00
Kconfig	net: sched: add em_ipt ematch for calling xtables matches	2018-02-21 13:15:33 -05:00
Makefile	net: sched: add em_ipt ematch for calling xtables matches	2018-02-21 13:15:33 -05:00
sch_api.c	net: sch: Don't warn on missmatching qlen and backlog for offloaded qdiscs	2018-02-28 12:06:00 -05:00
sch_atm.c	net: sch: api: add extack support in qdisc_create_dflt	2017-12-21 12:32:51 -05: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: sch: sch_cbq: add extack support	2017-12-21 12:32:51 -05:00
sch_cbs.c	net: sch: sch_cbs: add extack support	2017-12-21 12:32:51 -05:00
sch_choke.c	net: sched: sch: add extack for change qdisc ops	2017-12-21 12:32:50 -05:00
sch_codel.c	net: sched: sch: add extack for change qdisc ops	2017-12-21 12:32:50 -05:00
sch_drr.c	net: sch: sch_drr: add extack support	2017-12-21 12:32:51 -05:00
sch_dsmark.c	net: sch: api: add extack support in qdisc_create_dflt	2017-12-21 12:32:51 -05:00
sch_fifo.c	net: sch: api: add extack support in qdisc_create_dflt	2017-12-21 12:32:51 -05:00
sch_fq_codel.c	net: sch: api: add extack support in tcf_block_get	2017-12-21 12:32:51 -05:00
sch_fq.c	net: sched: sch: add extack for change qdisc ops	2017-12-21 12:32:50 -05:00
sch_generic.c	net_sched: implement ->change_tx_queue_len() for pfifo_fast	2018-01-29 12:42:15 -05:00
sch_gred.c	net: sched: sch: add extack for change qdisc ops	2017-12-21 12:32:50 -05:00
sch_hfsc.c	net: sch: api: add extack support in qdisc_create_dflt	2017-12-21 12:32:51 -05:00
sch_hhf.c	net: sched: sch: add extack for change qdisc ops	2017-12-21 12:32:50 -05:00
sch_htb.c	net: sch: api: add extack support in qdisc_create_dflt	2017-12-21 12:32:51 -05:00
sch_ingress.c	net: sched: allow ingress and clsact qdiscs to share filter blocks	2018-01-17 14:53:57 -05:00
sch_mq.c	net: sch: api: add extack support in qdisc_create_dflt	2017-12-21 12:32:51 -05:00
sch_mqprio.c	net: sch: api: add extack support in qdisc_create_dflt	2017-12-21 12:32:51 -05:00
sch_multiq.c	net: sch: api: add extack support in qdisc_create_dflt	2017-12-21 12:32:51 -05:00
sch_netem.c	sch_netem: Bug fixing in calculating Netem interval	2018-02-07 21:59:12 -05:00
sch_pie.c	net: sched: sch: add extack for change qdisc ops	2017-12-21 12:32:50 -05:00
sch_plug.c	net: sched: sch: add extack for change qdisc ops	2017-12-21 12:32:50 -05:00
sch_prio.c	net: sch: prio: Add offload ability for grafting a child	2018-02-28 12:06:01 -05:00
sch_qfq.c	net: sch: api: add extack support in qdisc_create_dflt	2017-12-21 12:32:51 -05:00
sch_red.c	net: sched: red: don't reset the backlog on every stat dump	2018-01-17 14:29:32 -05:00
sch_sfb.c	net: sch: api: add extack support in qdisc_create_dflt	2017-12-21 12:32:51 -05:00
sch_sfq.c	net: sch: api: add extack support in tcf_block_get	2017-12-21 12:32:51 -05:00
sch_tbf.c	net: sched: tbf: handle GSO_BY_FRAGS case in enqueue	2018-03-04 17:49:17 -05:00
sch_teql.c	net: sched: sch: add extack for init callback	2017-12-21 12:32:50 -05:00