David S. Miller 60747ef4d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Minor overlapping changes for both merge conflicts.

Resolution work done by Stephen Rothwell was used
as a reference.

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

2016-08-18 01:17:32 -04:00

..

act_api.c

net_sched: convert tcf_exts from list to pointer array

2016-08-17 19:27:51 -04:00

act_bpf.c

net_sched: move tc_action into tcf_common

2016-07-25 21:49:19 -07:00

act_connmark.c

net_sched: move tc_action into tcf_common

2016-07-25 21:49:19 -07:00

act_csum.c

net_sched: move tc_action into tcf_common

2016-07-25 21:49:19 -07:00

act_gact.c

net_sched: move tc_action into tcf_common

2016-07-25 21:49:19 -07:00

act_ife.c

net_sched: move tc_action into tcf_common

2016-07-25 21:49:19 -07:00

act_ipt.c

net_sched: move tc_action into tcf_common

2016-07-25 21:49:19 -07:00

act_meta_mark.c

Support to encoding decoding skb mark on IFE action

2016-03-01 17:15:23 -05:00

act_meta_skbprio.c

Support to encoding decoding skb prio on IFE action

2016-03-01 17:15:23 -05:00

act_mirred.c

net_sched: move tc_action into tcf_common

2016-07-25 21:49:19 -07:00

act_nat.c

net_sched: move tc_action into tcf_common

2016-07-25 21:49:19 -07:00

act_pedit.c

net_sched: move tc_action into tcf_common

2016-07-25 21:49:19 -07:00

act_police.c

net_sched: allow flushing tc police actions

2016-08-17 19:27:51 -04:00

act_simple.c

net_sched: move tc_action into tcf_common

2016-07-25 21:49:19 -07:00

act_skbedit.c

net_sched: move tc_action into tcf_common

2016-07-25 21:49:19 -07:00

act_vlan.c

net_sched: move tc_action into tcf_common

2016-07-25 21:49:19 -07:00

cls_api.c

net_sched: convert tcf_exts from list to pointer array

2016-08-17 19:27:51 -04:00

cls_basic.c

…

cls_bpf.c

bpf: refactor bpf_prog_get and type check into helper

2016-07-01 16:00:47 -04:00

cls_cgroup.c

cls_cgroup: factor out classid retrieval

2015-07-20 12:41:30 -07:00

cls_flow.c

sched: cls_flow: use skb_to_full_sk() helper

2015-11-08 20:56:39 -05:00

cls_flower.c

net/sched: flower: Return error when hw can't offload and skip_sw is set

2016-06-14 22:37:26 -07:00

cls_fw.c

net: revert "net_sched: move tp->root allocation into fw_init()"

2015-09-24 14:33:30 -07:00

cls_matchall.c

net/sched: Add match-all classifier hw offloading.

2016-07-24 23:11:59 -07:00

cls_route.c

…

cls_rsvp6.c

…

cls_rsvp.c

…

cls_rsvp.h

net_sched: convert rsvp to call tcf_exts_destroy from rcu callback

2015-08-26 11:01:45 -07:00

cls_tcindex.c

net_sched: convert tcindex to call tcf_exts_destroy from rcu callback

2015-08-26 11:01:44 -07:00

cls_u32.c

net: cls_u32: be more strict about skip-sw flag for knodes

2016-06-08 21:43:14 -07:00

em_canid.c

…

em_cmp.c

…

em_ipset.c

netfilter: x_tables: Pass struct net in xt_action_param

2015-09-18 21:58:14 +02:00

em_meta.c

qdisc: constify meta_type_ops structures

2016-04-14 00:35:30 -04:00

em_nbyte.c

…

em_text.c

…

em_u32.c

…

ematch.c

…

Kconfig

net/sched: introduce Match-all classifier

2016-07-24 23:11:59 -07:00

Makefile

net/sched: introduce Match-all classifier

2016-07-24 23:11:59 -07:00

sch_api.c

net: sched: convert qdisc linked list to hashtable

2016-08-10 17:19:02 -07:00

sch_atm.c

net_sched: drop packets after root qdisc lock is released

2016-06-25 12:19:35 -04: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: drop packets after root qdisc lock is released

2016-06-25 12:19:35 -04:00

sch_choke.c

net_sched: drop packets after root qdisc lock is released

2016-06-25 12:19:35 -04:00

sch_codel.c

net_sched: drop packets after root qdisc lock is released

2016-06-25 12:19:35 -04:00

sch_drr.c

net_sched: drop packets after root qdisc lock is released

2016-06-25 12:19:35 -04:00

sch_dsmark.c

net_sched: drop packets after root qdisc lock is released

2016-06-25 12:19:35 -04:00

sch_fifo.c

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

2016-06-30 05:03:36 -04:00

sch_fq_codel.c

net_sched: fq_codel: cache skb->truesize into skb->cb

2016-06-25 12:19:35 -04:00

sch_fq.c

net_sched: drop packets after root qdisc lock is released

2016-06-25 12:19:35 -04:00

sch_generic.c

net: sched: convert qdisc linked list to hashtable

2016-08-10 17:19:02 -07:00

sch_gred.c

net_sched: drop packets after root qdisc lock is released

2016-06-25 12:19:35 -04:00

sch_hfsc.c

net/sched/sch_hfsc.c: remove unused cl_myfadj

2016-08-08 16:06:47 -07:00

sch_hhf.c

net_sched: drop packets after root qdisc lock is released

2016-06-25 12:19:35 -04:00

sch_htb.c

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

2016-07-24 00:53:32 -04:00

sch_ingress.c

net: sched: fix tc_should_offload for specific clsact classes

2016-06-07 16:59:53 -07:00

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

net_sched: drop packets after root qdisc lock is released

2016-06-25 12:19:35 -04:00

sch_netem.c

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

2016-06-30 05:03:36 -04:00

sch_pie.c

net_sched: drop packets after root qdisc lock is released

2016-06-25 12:19:35 -04: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

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

2016-06-30 05:03:36 -04:00

sch_qfq.c

net_sched: drop packets after root qdisc lock is released

2016-06-25 12:19:35 -04:00

sch_red.c

net_sched: drop packets after root qdisc lock is released

2016-06-25 12:19:35 -04:00

sch_sfb.c

net_sched: drop packets after root qdisc lock is released

2016-06-25 12:19:35 -04:00

sch_sfq.c

net_sched: drop packets after root qdisc lock is released

2016-06-25 12:19:35 -04:00

sch_tbf.c

net_sched: drop packets after root qdisc lock is released

2016-06-25 12:19:35 -04:00

sch_teql.c

net_sched: drop packets after root qdisc lock is released

2016-06-25 12:19:35 -04:00