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

Conflicts:
	drivers/net/ethernet/intel/e1000e/ethtool.c
	drivers/net/vmxnet3/vmxnet3_drv.c
	drivers/net/wireless/iwlwifi/dvm/tx.c
	net/ipv6/route.c

The ipv6 route.c conflict is simple, just ignore the 'net' side change
as we fixed the same problem in 'net-next' by eliminating cached
neighbours from ipv6 routes.

The e1000e conflict is an addition of a new statistic in the ethtool
code, trivial.

The vmxnet3 conflict is about one change in 'net' removing a guarding
conditional, whilst in 'net-next' we had a netdev_info() conversion.

The iwlwifi conflict is dealing with a WARN_ON() conversion in
'net-next' vs. a revert happening in 'net'.

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

2013-02-05 14:12:20 -05:00

..

act_api.c

pkt_sched: namespace aware act_mirred

2013-01-14 15:09:36 -05:00

act_csum.c

pkt_sched: namespace aware act_mirred

2013-01-14 15:09:36 -05:00

act_gact.c

pkt_sched: namespace aware act_mirred

2013-01-14 15:09:36 -05:00

act_ipt.c

pkt_sched: namespace aware act_mirred

2013-01-14 15:09:36 -05:00

act_mirred.c

pkt_sched: namespace aware act_mirred

2013-01-14 15:09:36 -05:00

act_nat.c

pkt_sched: namespace aware act_mirred

2013-01-14 15:09:36 -05:00

act_pedit.c

pkt_sched: namespace aware act_mirred

2013-01-14 15:09:36 -05:00

act_police.c

pkt_sched: namespace aware act_mirred

2013-01-14 15:09:36 -05:00

act_simple.c

pkt_sched: namespace aware act_mirred

2013-01-14 15:09:36 -05:00

act_skbedit.c

pkt_sched: namespace aware act_mirred

2013-01-14 15:09:36 -05:00

cls_api.c

pkt_sched: namespace aware act_mirred

2013-01-14 15:09:36 -05:00

cls_basic.c

pkt_sched: namespace aware act_mirred

2013-01-14 15:09:36 -05:00

cls_cgroup.c

pkt_sched: namespace aware act_mirred

2013-01-14 15:09:36 -05:00

cls_flow.c

pkt_sched: namespace aware act_mirred

2013-01-14 15:09:36 -05:00

cls_fw.c

pkt_sched: namespace aware act_mirred

2013-01-14 15:09:36 -05:00

cls_route.c

pkt_sched: namespace aware act_mirred

2013-01-14 15:09:36 -05:00

cls_rsvp6.c

…

cls_rsvp.c

…

cls_rsvp.h

pkt_sched: namespace aware act_mirred

2013-01-14 15:09:36 -05:00

cls_tcindex.c

pkt_sched: namespace aware act_mirred

2013-01-14 15:09:36 -05:00

cls_u32.c

pkt_sched: namespace aware act_mirred

2013-01-14 15:09:36 -05: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

net: sched: add ipset ematch

2012-07-12 07:54:46 -07:00

em_meta.c

net: use a per task frag allocator

2012-09-24 16:31:37 -04: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: sched: enable CAN Identifier to be build into kernel

2012-11-25 16:06:06 -05:00

Makefile

net: sched: add ipset ematch

2012-07-12 07:54:46 -07:00

sch_api.c

pkt_sched: avoid requeues if possible

2012-12-12 00:16:47 -05:00

sch_atm.c

sch_atm.c: get rid of poinless extern

2012-06-01 10:37:18 -04:00

sch_blackhole.c

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

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

sch_cbq.c

pkt_sched: use ns_to_ktime() helper

2012-10-21 22:21:27 -04:00

sch_choke.c

net: sched: factorize code (qdisc_drop())

2012-05-04 11:50:05 -04:00

sch_codel.c

fq_codel: should use qdisc backlog as threshold

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

sch_drr.c

pkt_sched: Fix warning false positives.

2012-09-27 18:35:47 -04:00

sch_dsmark.c

net: sched: factorize code (qdisc_drop())

2012-05-04 11:50:05 -04:00

sch_fifo.c

pkt_sched: Stop using NLA_PUT*().

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

sch_fq_codel.c

fq_codel: dont reinit flow state

2012-09-03 14:36:50 -04:00

sch_generic.c

pkt_sched: avoid requeues if possible

2012-12-12 00:16:47 -05:00

sch_gred.c

net_sched: gred: actually perform idling in WRED mode

2012-09-13 16:10:13 -04:00

sch_hfsc.c

net_sched: update bstats in dequeue()

2012-05-10 23:33:01 -04:00

sch_htb.c

net: sched: integer overflow fix

2012-12-22 00:03:00 -08:00

sch_ingress.c

net_sched: factorize qdisc stats handling

2011-01-10 16:07:54 -08:00

sch_mq.c

pkt_sched: avoid requeues if possible

2012-12-12 00:16:47 -05:00

sch_mqprio.c

pkt_sched: avoid requeues if possible

2012-12-12 00:16:47 -05:00

sch_multiq.c

pkt_sched: Stop using NLA_PUT*().

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

sch_netem.c

netem: fix delay calculation in rate extension

2013-01-29 15:43:02 -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: QFQ Plus: fair-queueing service at DRR cost

2012-11-28 11:19:35 -05:00

sch_red.c

pkt_sched: Stop using NLA_PUT*().

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

sch_sfb.c

sch_sfb: Fix missing NULL check

2012-07-12 08:33:18 -07:00

sch_sfq.c

pkt_sched: Stop using NLA_PUT*().

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

sch_tbf.c

pkt_sched: Stop using NLA_PUT*().

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

sch_teql.c

sch_teql: Convert over to dev_neigh_lookup_skb().

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