Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 15:10:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux-stable/net/sched
History
David S. Miller c0b458a946 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Minor conflicts in drivers/net/ethernet/mellanox/mlx5/core/en_rep.c,
we had some overlapping changes:

1) In 'net' MLX5E_PARAMS_LOG_{SQ,RQ}_SIZE -->
   MLX5E_REP_PARAMS_LOG_{SQ,RQ}_SIZE

2) In 'net-next' params->log_rq_size is renamed to be
   params->log_rq_mtu_frames.

3) In 'net-next' params->hard_mtu is added.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-04-01 19:49:34 -04:00
..
act_api.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-04-01 19:49:34 -04:00
act_bpf.c
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
act_connmark.c
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
act_csum.c
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
act_gact.c
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
act_ife.c
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
act_ipt.c
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04: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: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
act_nat.c
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
act_pedit.c
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
act_police.c
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
act_sample.c
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
act_simple.c
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
act_skbedit.c
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
act_skbmod.c
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
act_tunnel_key.c
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
act_vlan.c
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
cls_api.c
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04: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
net/sched: cls_flower: Add support to handle first frag as match field
2018-03-08 12:16:29 -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_rsvp6.c
…
cls_rsvp.c
…
cls_rsvp.h
net: sched: propagate extack to cls->destroy callbacks
2018-01-24 16:01:09 -05:00
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
net: sched: remove tcf_proto from ematch calls
2014-10-06 18:02:32 -04:00
em_cmp.c
net_sched: cleanups
2011-01-19 23:31:12 -08:00
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
net: Remove state argument from skb_find_text()
2015-02-22 15:59:54 -05:00
em_u32.c
net_sched: cleanups
2011-01-19 23:31:12 -08:00
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: Drop pernet_operations::async
2018-03-27 13:18:09 -04: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, fix OOO packets with pfifo_fast
2018-03-26 12:36:23 -04: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: fix skb leak in netem_enqueue()
2018-03-07 11:18:14 -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