David S. Miller 51e18a453f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflict was two parallel additions of include files to sch_generic.c,
no biggie.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-12-09 22:09:55 -05:00

..

act_api.c

net_sched: remove unused parameter from act cleanup ops

2017-12-05 18:07:58 -05:00

act_bpf.c

net_sched: remove unused parameter from act cleanup ops

2017-12-05 18:07:58 -05:00

act_connmark.c

Revert "net_sched: hold netns refcnt for each action"

2017-11-09 10:03:09 +09:00

act_csum.c

net: accept UFO datagrams from tuntap and packet

2017-11-24 01:37:35 +09:00

act_gact.c

Revert "net_sched: hold netns refcnt for each action"

2017-11-09 10:03:09 +09:00

act_ife.c

net_sched: remove unused parameter from act cleanup ops

2017-12-05 18:07:58 -05:00

act_ipt.c

net_sched: remove unused parameter from act cleanup ops

2017-12-05 18:07:58 -05: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

act_mirred: get rid of mirred_list_lock spinlock

2017-12-06 14:50:13 -05:00

act_nat.c

Revert "net_sched: hold netns refcnt for each action"

2017-11-09 10:03:09 +09:00

act_pedit.c

net_sched: remove unused parameter from act cleanup ops

2017-12-05 18:07:58 -05:00

act_police.c

Revert "net_sched: hold netns refcnt for each action"

2017-11-09 10:03:09 +09:00

act_sample.c

net_sched: remove unused parameter from act cleanup ops

2017-12-05 18:07:58 -05:00

act_simple.c

net_sched: remove unused parameter from act cleanup ops

2017-12-05 18:07:58 -05:00

act_skbedit.c

Revert "net_sched: hold netns refcnt for each action"

2017-11-09 10:03:09 +09:00

act_skbmod.c

net_sched: remove unused parameter from act cleanup ops

2017-12-05 18:07:58 -05:00

act_tunnel_key.c

net_sched: remove unused parameter from act cleanup ops

2017-12-05 18:07:58 -05:00

act_vlan.c

net_sched: remove unused parameter from act cleanup ops

2017-12-05 18:07:58 -05:00

cls_api.c

net: sched: fix use-after-free in tcf_block_put_ext

2017-12-08 14:09:08 -05:00

cls_basic.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-11-10 10:00:18 +09:00

cls_bpf.c

cls_bpf: don't decrement net's refcount when offload fails

2017-11-28 15:49:44 -05:00

cls_cgroup.c

cls_cgroup: use tcf_exts_get_net() before call_rcu()

2017-11-09 10:03:09 +09:00

cls_flow.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-11-10 10:00:18 +09:00

cls_flower.c

flow_dissector: dissect tunnel info outside __skb_flow_dissect()

2017-12-05 12:09:18 -05:00

cls_fw.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-11-10 10:00:18 +09:00

cls_matchall.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-11-10 10:00:18 +09:00

cls_route.c

cls_route: use tcf_exts_get_net() before call_rcu()

2017-11-09 10:03:10 +09:00

cls_rsvp6.c

…

cls_rsvp.c

…

cls_rsvp.h

cls_rsvp: use tcf_exts_get_net() before call_rcu()

2017-11-09 10:03:10 +09:00

cls_tcindex.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-11-10 10:00:18 +09:00

cls_u32.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-11-10 10:00:18 +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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-11-04 09:26:51 +09:00

sch_api.c

net: sched: pfifo_fast use skb_array

2017-12-08 13:32:26 -05: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: cbq: create block for q->link.block

2017-11-28 16:04:26 -05:00

sch_cbs.c

net_sch: cbs: Change TC_SETUP_CBS to TC_SETUP_QDISC_CBS

2017-11-08 12:23:38 +09:00

sch_choke.c

net_sched: red: Avoid illegal values

2017-12-05 14:37:13 -05: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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-12-09 22:09:55 -05:00

sch_gred.c

net_sched: red: Avoid illegal values

2017-12-05 14:37:13 -05: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: core: introduce mini_Qdisc and eliminate usage of tp->q for clsact fastpath

2017-11-03 21:57:24 +09:00

sch_mq.c

net: sched: add support for TCQ_F_NOLOCK subqueues to sch_mqprio

2017-12-08 13:32:26 -05:00

sch_mqprio.c

net: sched: add support for TCQ_F_NOLOCK subqueues to sch_mqprio

2017-12-08 13:32:26 -05:00

sch_multiq.c

net: sched: mark expected switch fall-throughs

2017-10-22 02:07:08 +01:00

sch_netem.c

netem: remove unnecessary 64 bit modulus

2017-11-15 14:14:16 +09: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: red: Avoid illegal values

2017-12-05 14:37:13 -05:00

sch_sfb.c

net: sched: mark expected switch fall-throughs

2017-10-22 02:07:08 +01:00

sch_sfq.c

net_sched: red: Avoid illegal values

2017-12-05 14:37:13 -05: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