David S. Miller 6b6cbc1471 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts were simply overlapping changes.  In the net/ipv4/route.c
case the code had simply moved around a little bit and the same fix
was made in both 'net' and 'net-next'.

In the net/sched/sch_generic.c case a fix in 'net' happened at
the same time that a new argument was added to qdisc_hash_add().

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

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

..

act_api.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -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

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -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

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_meta_skbtcindex.c

net sched ife action: Introduce skb tcindex metadata encap decap

2016-09-19 21:55:28 -04:00

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

netlink: pass extended ACK struct to parsing functions

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

act_police.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -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

netlink: pass extended ACK struct to parsing functions

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

cls_basic.c

netlink: pass extended ACK struct to parsing functions

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

cls_bpf.c

netlink: pass extended ACK struct to parsing functions

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

cls_cgroup.c

netlink: pass extended ACK struct to parsing functions

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

cls_flow.c

netlink: pass extended ACK struct to parsing functions

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

cls_flower.c

netlink: pass extended ACK struct to parsing functions

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

cls_fw.c

netlink: pass extended ACK struct to parsing functions

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

cls_matchall.c

netlink: pass extended ACK struct to parsing functions

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

cls_route.c

netlink: pass extended ACK struct to parsing functions

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

cls_rsvp6.c

…

cls_rsvp.c

…

cls_rsvp.h

netlink: pass extended ACK struct to parsing functions

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

cls_tcindex.c

netlink: pass extended ACK struct to parsing functions

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

cls_u32.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04: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_meta.c

netlink: pass extended ACK struct to parsing functions

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

em_nbyte.c

…

em_text.c

net: Remove state argument from skb_find_text()

2015-02-22 15:59:54 -05:00

em_u32.c

…

ematch.c

netlink: pass extended ACK struct to parsing functions

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

Kconfig

net/sched: act_ife: Change to use ife module

2017-02-03 15:16:46 -05:00

Makefile

net/sched: Introduce sample tc action

2017-01-24 13:44:28 -05:00

sch_api.c

netlink: pass extended ACK struct to parsing functions

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

sch_atm.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -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

netlink: pass extended ACK struct to parsing functions

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

sch_choke.c

netlink: pass extended ACK struct to parsing functions

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

sch_codel.c

netlink: pass extended ACK struct to parsing functions

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

sch_drr.c

netlink: pass extended ACK struct to parsing functions

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

sch_dsmark.c

netlink: pass extended ACK struct to parsing functions

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

sch_fifo.c

sched: don't use skb queue helpers

2016-09-19 01:47:18 -04:00

sch_fq_codel.c

netlink: pass extended ACK struct to parsing functions

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

sch_fq.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -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

netlink: pass extended ACK struct to parsing functions

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

sch_hhf.c

netlink: pass extended ACK struct to parsing functions

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

sch_htb.c

netlink: pass extended ACK struct to parsing functions

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

sch_ingress.c

sched: move tcf_proto_destroy and tcf_destroy_chain helpers into cls_api

2017-02-10 11:38:08 -05:00

sch_mq.c

net: sched: make default fifo qdiscs appear in the dump

2017-03-12 22:53:02 -07:00

sch_mqprio.c

mqprio: Modify mqprio to pass user parameters via ndo_setup_tc.

2017-03-15 15:20:27 -07:00

sch_multiq.c

net: sched: make default fifo qdiscs appear in the dump

2017-03-12 22:53:02 -07:00

sch_netem.c

netlink: pass extended ACK struct to parsing functions

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

sch_pie.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -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

net: sched: make default fifo qdiscs appear in the dump

2017-03-12 22:53:02 -07:00

sch_qfq.c

netlink: pass extended ACK struct to parsing functions

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

sch_red.c

netlink: pass extended ACK struct to parsing functions

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

sch_sfb.c

netlink: pass extended ACK struct to parsing functions

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

sch_sfq.c

net_sched: use setup_deferrable_timer

2017-03-24 14:42:52 -07:00

sch_tbf.c

netlink: pass extended ACK struct to parsing functions

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

sch_teql.c

net: make ndo_get_stats64 a void function

2017-01-08 17:51:44 -05:00