David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

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

2017-06-15 11:59:32 -04:00

..

act_api.c

net_sched: only create filter chains for new filters/actions

2017-05-25 12:15:05 -04:00

act_bpf.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

act_connmark.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

act_csum.c

net: use skb->csum_not_inet to identify packets needing crc32c

2017-05-19 19:21:29 -04:00

act_gact.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

act_ife.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

act_ipt.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

act_meta_mark.c

…

act_meta_skbprio.c

…

act_meta_skbtcindex.c

…

act_mirred.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

act_nat.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

act_pedit.c

net/act_pedit: fix an error code

2017-06-14 15:24:18 -04:00

act_police.c

net_sched: move tcf_lock down after gen_replace_estimator()

2017-06-14 14:39:19 -04:00

act_sample.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

act_simple.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

act_skbedit.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

act_skbmod.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

act_tunnel_key.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

act_vlan.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

cls_api.c

net_sched: only create filter chains for new filters/actions

2017-05-25 12:15:05 -04:00

cls_basic.c

net_sched: move the empty tp check from ->destroy() to ->delete()

2017-04-21 13:58:15 -04:00

cls_bpf.c

net: propagate tc filter chain index down the ndo_setup_tc call

2017-06-08 09:55:53 -04:00

cls_cgroup.c

net_sched: move the empty tp check from ->destroy() to ->delete()

2017-04-21 13:58:15 -04:00

cls_flow.c

net_sched: move the empty tp check from ->destroy() to ->delete()

2017-04-21 13:58:15 -04:00

cls_flower.c

net: propagate tc filter chain index down the ndo_setup_tc call

2017-06-08 09:55:53 -04:00

cls_fw.c

net_sched: remove useless NULL to tp->root

2017-04-21 13:58:15 -04:00

cls_matchall.c

net: propagate tc filter chain index down the ndo_setup_tc call

2017-06-08 09:55:53 -04:00

cls_route.c

net_sched: remove useless NULL to tp->root

2017-04-21 13:58:15 -04:00

cls_rsvp6.c

…

cls_rsvp.c

…

cls_rsvp.h

net_sched: remove useless NULL to tp->root

2017-04-21 13:58:15 -04:00

cls_tcindex.c

net_sched: move the empty tp check from ->destroy() to ->delete()

2017-04-21 13:58:15 -04:00

cls_u32.c

net: propagate tc filter chain index down the ndo_setup_tc call

2017-06-08 09:55:53 -04:00

em_canid.c

…

em_cmp.c

…

em_ipset.c

…

em_meta.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

em_nbyte.c

…

em_text.c

…

em_u32.c

…

ematch.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

Kconfig

net: sched: select cls when cls_act is enabled

2017-06-05 10:56:36 -04:00

Makefile

…

sch_api.c

net: sched: introduce tcf block infractructure

2017-05-17 15:22:13 -04:00

sch_atm.c

net: sched: introduce a TRAP control action

2017-06-06 12:45:23 -04:00

sch_blackhole.c

…

sch_cbq.c

net: sched: introduce a TRAP control action

2017-06-06 12:45:23 -04:00

sch_choke.c

treewide: use kv[mz]alloc* rather than opencoded variants

2017-05-08 17:15:13 -07: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: introduce a TRAP control action

2017-06-06 12:45:23 -04:00

sch_dsmark.c

net: sched: introduce a TRAP control action

2017-06-06 12:45:23 -04:00

sch_fifo.c

…

sch_fq_codel.c

net: sched: introduce a TRAP control action

2017-06-06 12:45:23 -04:00

sch_fq.c

tcp: internal implementation for pacing

2017-05-16 15:43:31 -04:00

sch_generic.c

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

2017-04-15 21:16:30 -04:00

sch_gred.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

sch_hfsc.c

net: sched: introduce a TRAP control action

2017-06-06 12:45:23 -04:00

sch_hhf.c

treewide: use kv[mz]alloc* rather than opencoded variants

2017-05-08 17:15:13 -07:00

sch_htb.c

net: sched: introduce a TRAP control action

2017-06-06 12:45:23 -04:00

sch_ingress.c

net: sched: introduce tcf block infractructure

2017-05-17 15:22:13 -04:00

sch_mq.c

…

sch_mqprio.c

net: propagate tc filter chain index down the ndo_setup_tc call

2017-06-08 09:55:53 -04:00

sch_multiq.c

net: sched: introduce a TRAP control action

2017-06-06 12:45:23 -04:00

sch_netem.c

treewide: use kv[mz]alloc* rather than opencoded variants

2017-05-08 17:15:13 -07:00

sch_pie.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

sch_plug.c

…

sch_prio.c

net: sched: introduce a TRAP control action

2017-06-06 12:45:23 -04:00

sch_qfq.c

net: sched: introduce a TRAP control action

2017-06-06 12:45:23 -04:00

sch_red.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

sch_sfb.c

net: sched: introduce a TRAP control action

2017-06-06 12:45:23 -04:00

sch_sfq.c

net: sched: introduce a TRAP control action

2017-06-06 12:45:23 -04:00

sch_tbf.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

sch_teql.c

…