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

Conflicts:
	drivers/net/phy/amd-xgbe-phy.c
	drivers/net/wireless/iwlwifi/Kconfig
	include/net/mac80211.h

iwlwifi/Kconfig and mac80211.h were both trivial overlapping
changes.

The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and
the bug fix that happened on the 'net' side is already integrated
into the rest of the amd-xgbe driver.

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

2015-06-01 22:51:30 -07:00

..

act_api.c

net: sched: remove TC_MUNGED bits

2015-05-02 22:25:17 -04:00

act_bpf.c

bpf: fix bpf helpers to use skb->mac_header relative offsets

2015-04-16 14:08:49 -04:00

act_connmark.c

net: sched: act_connmark: don't zap skb->nfct

2015-04-29 14:56:40 -04:00

act_csum.c

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

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

act_gact.c

sched: fix act file names in header comment

2014-11-06 15:04:41 -05:00

act_ipt.c

sched: fix act file names in header comment

2014-11-06 15:04:41 -05:00

act_mirred.c

net: sched: use counter to break reclassify loops

2015-05-13 15:08:14 -04: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: remove TC_MUNGED bits

2015-05-02 22:25:17 -04:00

act_police.c

sched: fix act file names in header comment

2014-11-06 15:04:41 -05:00

act_simple.c

sched: fix act file names in header comment

2014-11-06 15:04:41 -05:00

act_skbedit.c

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

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

act_vlan.c

sched: introduce vlan action

2014-11-21 14:20:18 -05: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

bpf: fix bpf helpers to use skb->mac_header relative offsets

2015-04-16 14:08:49 -04:00

cls_cgroup.c

net_sched: destroy proto tp when all filters are gone

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

cls_flow.c

flow_dissector: change port array into src, dst tuple

2015-05-13 15:19:47 -04:00

cls_flower.c

cls_flower: Fix compile error

2015-05-14 13:34:35 -04:00

cls_fw.c

net_sched: destroy proto tp when all filters are gone

2015-03-09 15:35:55 -04: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

[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

net_sched: destroy proto tp when all filters are gone

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

cls_tcindex.c

net_sched: destroy proto tp when all filters are gone

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

cls_u32.c

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

2015-03-20 18:51:09 -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

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

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

em_meta.c

net: rename vlan_tx_* helpers since "tx" is misleading there

2015-01-13 17:51:08 -05: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

net: add CONFIG_NET_INGRESS to enable ingress filtering

2015-05-14 01:10:05 -04:00

Makefile

tc: introduce Flower classifier

2015-05-13 15:19:48 -04:00

sch_api.c

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

2015-06-01 22:51:30 -07:00

sch_atm.c

net: sched: enable per cpu qstats

2014-09-30 01:02:26 -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: enable per cpu qstats

2014-09-30 01:02:26 -04:00

sch_choke.c

flow_dissect: use programable dissector in skb_flow_dissect and friends

2015-05-13 15:19:47 -04:00

sch_codel.c

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

2015-05-13 14:31:43 -04:00

sch_drr.c

net: sched: enable per cpu qstats

2014-09-30 01:02:26 -04:00

sch_dsmark.c

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

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

sch_fifo.c

net: sched: implement qstat helper routines

2014-09-30 01:02:26 -04:00

sch_fq_codel.c

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

2015-05-13 14:31:43 -04:00

sch_fq.c

pkt_sched: fq: correct spelling of locally

2015-04-01 22:52:29 -04:00

sch_generic.c

net_sched: restore qdisc quota fairness limits after bulk dequeue

2014-10-09 19:12:26 -04:00

sch_gred.c

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

2015-05-13 14:31:43 -04:00

sch_hfsc.c

net: sched: enable per cpu qstats

2014-09-30 01:02:26 -04:00

sch_hhf.c

sched: Call skb_get_hash_perturb in sch_hhf

2015-05-04 00:09:08 -04:00

sch_htb.c

net: sched: enable per cpu qstats

2014-09-30 01:02:26 -04:00

sch_ingress.c

net: sched: further simplify handle_ing

2015-05-11 11:10:35 -04:00

sch_mq.c

net: sched: enable per cpu qstats

2014-09-30 01:02:26 -04:00

sch_mqprio.c

net: sched: enable per cpu qstats

2014-09-30 01:02:26 -04:00

sch_multiq.c

net: sched: enable per cpu qstats

2014-09-30 01:02:26 -04:00

sch_netem.c

net: sched: deprecate enqueue_root()

2015-05-11 14:17:32 -04:00

sch_pie.c

sch_pie: schedule the timer after all init succeed

2014-10-29 14:28:01 -04:00

sch_plug.c

net_sched: sch_plug: plug_qdisc_ops is static

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

sch_prio.c

net: sched: enable per cpu qstats

2014-09-30 01:02:26 -04:00

sch_qfq.c

net: sched: enable per cpu qstats

2014-09-30 01:02:26 -04:00

sch_red.c

net: sched: implement qstat helper routines

2014-09-30 01:02:26 -04:00

sch_sfb.c

sched: Call skb_get_hash_perturb in sch_sfb

2015-05-04 00:09:08 -04:00

sch_sfq.c

sched: Call skb_get_hash_perturb in sch_sfq

2015-05-04 00:09:08 -04:00

sch_tbf.c

net: sched: avoid costly atomic operation in fq_dequeue()

2014-10-06 00:55:10 -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