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

Conflicts:
	net/ipv4/ip_gre.c

Minor conflicts between tunnel bug fixes in net and
ipv6 tunnel cleanups in net-next.

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

2016-05-04 00:52:29 -04:00

..

act_api.c

sched: align nlattr properly when needed

2016-04-26 12:00:49 -04:00

act_bpf.c

sched: align nlattr properly when needed

2016-04-26 12:00:49 -04:00

act_connmark.c

sched: align nlattr properly when needed

2016-04-26 12:00:49 -04:00

act_csum.c

sched: align nlattr properly when needed

2016-04-26 12:00:49 -04:00

act_gact.c

sched: align nlattr properly when needed

2016-04-26 12:00:49 -04:00

act_ife.c

sched: align nlattr properly when needed

2016-04-26 12:00:49 -04:00

act_ipt.c

sched: align nlattr properly when needed

2016-04-26 12:00:49 -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_mirred.c

sched: align nlattr properly when needed

2016-04-26 12:00:49 -04:00

act_nat.c

sched: align nlattr properly when needed

2016-04-26 12:00:49 -04:00

act_pedit.c

sched: align nlattr properly when needed

2016-04-26 12:00:49 -04:00

act_police.c

net_sched: add network namespace support for tc actions

2016-02-25 14:16:21 -05:00

act_simple.c

sched: align nlattr properly when needed

2016-04-26 12:00:49 -04:00

act_skbedit.c

sched: align nlattr properly when needed

2016-04-26 12:00:49 -04:00

act_vlan.c

sched: align nlattr properly when needed

2016-04-26 12:00:49 -04:00

cls_api.c

net: sched: fix call_rcu() race on classifier module unloads

2015-05-21 18:48:18 -04:00

cls_basic.c

net_sched: destroy proto tp when all filters are gone

2015-03-09 15:35:55 -04:00

cls_bpf.c

cls_bpf: reset class and reuse major in da

2016-03-18 19:35:21 -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/flower: Fix pointer cast

2016-03-11 12:04:37 -05:00

cls_fw.c

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

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

cls_route.c

net_sched: destroy proto tp when all filters are gone

2015-03-09 15:35:55 -04:00

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

sched: align nlattr properly when needed

2016-04-26 12:00:49 -04: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: 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

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

net_sched: cleanups

2011-01-19 23:31:12 -08:00

ematch.c

ematch: Fix auto-loading of ematch modules.

2015-02-20 15:30:56 -05:00

Kconfig

Support to encoding decoding skb prio on IFE action

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

Makefile

Support to encoding decoding skb prio on IFE action

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

sch_api.c

sched: align nlattr properly when needed

2016-04-26 12:00:49 -04:00

sch_atm.c

net: sched: consolidate tc_classify{,_compat}

2015-08-27 14:18:48 -07:00

sch_blackhole.c

net/sched: make sch_blackhole.c explicitly non-modular

2015-10-09 07:52:28 -07:00

sch_cbq.c

net_sched: update hierarchical backlog too

2016-02-29 17:02:33 -05:00

sch_choke.c

net_sched: update hierarchical backlog too

2016-02-29 17:02:33 -05:00

sch_codel.c

codel: split into multiple files

2016-04-25 16:44:27 -04:00

sch_drr.c

net_sched: update hierarchical backlog too

2016-02-29 17:02:33 -05:00

sch_dsmark.c

net_sched: dsmark: use qdisc_dequeue_peeked()

2016-03-08 14:35:13 -05:00

sch_fifo.c

net: sched: drop all special handling of tx_queue_len == 0

2015-08-18 11:55:08 -07:00

sch_fq_codel.c

fq_codel: add batch ability to fq_codel_drop()

2016-05-03 12:47:09 -04:00

sch_fq.c

net_sched: update hierarchical backlog too

2016-02-29 17:02:33 -05:00

sch_generic.c

net: remove NETDEV_TX_LOCKED support

2016-04-26 15:53:05 -04:00

sch_gred.c

net: sched: drop all special handling of tx_queue_len == 0

2015-08-18 11:55:08 -07:00

sch_hfsc.c

net_sched: update hierarchical backlog too

2016-02-29 17:02:33 -05:00

sch_hhf.c

net_sched: update hierarchical backlog too

2016-02-29 17:02:33 -05:00

sch_htb.c

sched: use nla_put_u64_64bit()

2016-04-25 15:09:09 -04:00

sch_ingress.c

net, sched: add clsact qdisc

2016-01-10 22:13:15 -05:00

sch_mq.c

net: sched: use pfifo_fast for non real queues

2016-03-03 17:38:46 -05:00

sch_mqprio.c

net: sched: use pfifo_fast for non real queues

2016-03-03 17:38:46 -05:00

sch_multiq.c

net_sched: update hierarchical backlog too

2016-02-29 17:02:33 -05:00

sch_netem.c

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

2016-05-04 00:52:29 -04:00

sch_pie.c

net_sched: update hierarchical backlog too

2016-02-29 17:02:33 -05:00

sch_plug.c

net: sched: drop all special handling of tx_queue_len == 0

2015-08-18 11:55:08 -07:00

sch_prio.c

net_sched: update hierarchical backlog too

2016-02-29 17:02:33 -05:00

sch_qfq.c

net_sched: update hierarchical backlog too

2016-02-29 17:02:33 -05:00

sch_red.c

net_sched: update hierarchical backlog too

2016-02-29 17:02:33 -05:00

sch_sfb.c

net_sched: update hierarchical backlog too

2016-02-29 17:02:33 -05:00

sch_sfq.c

net_sched: update hierarchical backlog too

2016-02-29 17:02:33 -05:00

sch_tbf.c

sched: use nla_put_u64_64bit()

2016-04-25 15:09:09 -04:00

sch_teql.c

net: sched: fix skb->protocol use in case of accelerated vlan path

2015-01-13 17:51:08 -05:00