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

Conflicts:
	drivers/net/bonding/bond_alb.c
	drivers/net/ethernet/altera/altera_msgdma.c
	drivers/net/ethernet/altera/altera_sgdma.c
	net/ipv6/xfrm6_output.c

Several cases of overlapping changes.

The xfrm6_output.c has a bug fix which overlaps the renaming
of skb->local_df to skb->ignore_df.

In the Altera TSE driver cases, the register access cleanups
in net-next overlapped with bug fixes done in net.

Similarly a bug fix to send ALB packets in the bonding driver using
the right source address overlaps with cleanups in net-next.

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

2014-05-24 00:32:30 -04:00

..

act_api.c

net: Use netlink_ns_capable to verify the permisions of netlink messages

2014-04-24 13:44:54 -04:00

act_csum.c

net_sched: act: move tcf_hashinfo_init() into tcf_register_action()

2014-02-12 19:23:32 -05:00

act_gact.c

net_sched: act: move tcf_hashinfo_init() into tcf_register_action()

2014-02-12 19:23:32 -05:00

act_ipt.c

net_sched: act: move tcf_hashinfo_init() into tcf_register_action()

2014-02-12 19:23:32 -05:00

act_mirred.c

net_sched: act: move tcf_hashinfo_init() into tcf_register_action()

2014-02-12 19:23:32 -05:00

act_nat.c

net_sched: act: move tcf_hashinfo_init() into tcf_register_action()

2014-02-12 19:23:32 -05:00

act_pedit.c

net_sched: act: move tcf_hashinfo_init() into tcf_register_action()

2014-02-12 19:23:32 -05:00

act_police.c

net_sched: act: move tcf_hashinfo_init() into tcf_register_action()

2014-02-12 19:23:32 -05:00

act_simple.c

net_sched: act: move tcf_hashinfo_init() into tcf_register_action()

2014-02-12 19:23:32 -05:00

act_skbedit.c

net_sched: act: move tcf_hashinfo_init() into tcf_register_action()

2014-02-12 19:23:32 -05:00

cls_api.c

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

2014-05-12 13:19:14 -04:00

cls_basic.c

sched, cls: check if we could overwrite actions when changing a filter

2014-04-27 23:42:39 -04:00

cls_bpf.c

net: filter: let unattached filters use sock_fprog_kern

2014-05-23 16:48:05 -04:00

cls_cgroup.c

sched, cls: check if we could overwrite actions when changing a filter

2014-04-27 23:42:39 -04:00

cls_flow.c

sched, cls: check if we could overwrite actions when changing a filter

2014-04-27 23:42:39 -04:00

cls_fw.c

sched, cls: check if we could overwrite actions when changing a filter

2014-04-27 23:42:39 -04:00

cls_route.c

sched, cls: check if we could overwrite actions when changing a filter

2014-04-27 23:42:39 -04:00

cls_rsvp6.c

[NET_SCHED]: Remove unnecessary includes

2007-07-10 22:16:41 -07:00

cls_rsvp.c

[NET_SCHED]: Remove unnecessary includes

2007-07-10 22:16:41 -07:00

cls_rsvp.h

sched, cls: check if we could overwrite actions when changing a filter

2014-04-27 23:42:39 -04:00

cls_tcindex.c

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

2014-05-24 00:32:30 -04:00

cls_u32.c

sched, cls: check if we could overwrite actions when changing a filter

2014-04-27 23:42:39 -04:00

em_canid.c

net: em_canid: Ematch rule to match CAN frames according to their identifiers

2012-07-04 13:07:05 +02:00

em_cmp.c

net_sched: cleanups

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

em_ipset.c

em_ipset: use dev_net() accessor

2013-10-18 16:23:06 -04:00

em_meta.c

net: Change skb_get_rxhash to skb_get_hash

2013-12-17 16:36:21 -05:00

em_nbyte.c

net_sched: cleanups

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

em_text.c

net_sched: cleanups

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

em_u32.c

net_sched: cleanups

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

ematch.c

net: Convert net_ratelimit uses to net_<level>_ratelimited

2012-05-15 13:45:03 -04:00

Kconfig

net: pkt_sched: PIE AQM scheme

2014-01-06 15:13:01 -05:00

Makefile

net: pkt_sched: PIE AQM scheme

2014-01-06 15:13:01 -05:00

sch_api.c

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

2014-05-12 13:19:14 -04:00

sch_atm.c

net_sched: return nla_nest_end() instead of skb->len

2014-03-13 15:39:20 -04:00

sch_blackhole.c

pkt_sched: Add qdisc->ops->peek() implementation.

2008-10-31 00:45:55 -07:00

sch_cbq.c

net_sched: return nla_nest_end() instead of skb->len

2014-03-13 15:39:20 -04:00

sch_choke.c

random32: add prandom_u32_max and convert open coded users

2014-01-21 23:17:20 -08:00

sch_codel.c

fq_codel: should use qdisc backlog as threshold

2012-05-16 15:30:26 -04:00

sch_drr.c

net_sched: add 64bit rate estimators

2013-06-11 02:51:03 -07:00

sch_dsmark.c

sch_dsmark: use correct func name in print messages

2013-12-31 13:50:57 -05:00

sch_fifo.c

pkt_sched: Stop using NLA_PUT*().

2012-04-01 18:11:37 -04:00

sch_fq_codel.c

net_sched: return nla_nest_end() instead of skb->len

2014-03-13 15:39:20 -04:00

sch_fq.c

net_sched: return nla_nest_end() instead of skb->len

2014-03-13 15:39:20 -04:00

sch_generic.c

net-sysfs: expose number of carrier on/off changes

2014-03-31 16:24:52 -04:00

sch_gred.c

net_sched: replace pr_warning with pr_warn

2013-12-31 13:50:56 -05:00

sch_hfsc.c

net_sched: return nla_nest_end() instead of skb->len

2014-03-13 15:39:20 -04:00

sch_hhf.c

sch_hhf: fix comparison of qlen and limit

2014-05-12 14:55:21 -04:00

sch_htb.c

net_sched: htb: do not acquire qdisc lock in dump operations

2014-03-06 17:24:54 -05:00

sch_ingress.c

net_sched: return nla_nest_end() instead of skb->len

2014-03-13 15:39:20 -04:00

sch_mq.c

pkt_sched: give visibility to mq slave qdiscs

2013-12-09 19:54:47 -05:00

sch_mqprio.c

pkt_sched: give visibility to mq slave qdiscs

2013-12-09 19:54:47 -05:00

sch_multiq.c

net/*: Fix FSF address in file headers

2013-12-06 12:37:57 -05:00

sch_netem.c

sch_netem: replace magic numbers with enumerate in get_loss_clg

2014-02-17 16:55:54 -05:00

sch_pie.c

net: sched: Cleanup PIE comments

2014-02-13 18:29:58 -05:00

sch_plug.c

net_sched: sch_plug: plug_qdisc_ops is static

2012-02-13 16:04:40 -05:00

sch_prio.c

pkt_sched: Stop using NLA_PUT*().

2012-04-01 18:11:37 -04:00

sch_qfq.c

pkt_sched: sch_qfq: remove a source of high packet delay/jitter

2013-07-18 13:02:00 -07:00

sch_red.c

pkt_sched: Stop using NLA_PUT*().

2012-04-01 18:11:37 -04:00

sch_sfb.c

net: replace macros net_random and net_srandom with direct calls to prandom

2014-01-14 15:15:25 -08:00

sch_sfq.c

net: replace macros net_random and net_srandom with direct calls to prandom

2014-01-14 15:15:25 -08:00

sch_tbf.c

net_sched: return nla_nest_end() instead of skb->len

2014-03-13 15:39:20 -04:00

sch_teql.c

sch_teql: Convert over to dev_neigh_lookup_skb().

2012-07-05 01:09:06 -07:00