Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 10 Jun 2016 18:52:24 +0000 (11:52 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 10 Jun 2016 18:52:24 +0000 (11:52 -0700)
commit1578b0a5e92825334760741e5c166b8873886f1b
treeac8299191f37990111f7d4b615601f4356e24fea
parent3d5479e92087f6249231e26a2d7327e86a8d0dfc
parent698ea54dde6768d4a96080d0fb796cb3a4eadaf8
Merge git://git./linux/kernel/git/davem/net

Conflicts:
net/sched/act_police.c
net/sched/sch_drr.c
net/sched/sch_hfsc.c
net/sched/sch_prio.c
net/sched/sch_red.c
net/sched/sch_tbf.c

In net-next the drop methods of the packet schedulers got removed, so
the bug fixes to them in 'net' are irrelevant.

A packet action unload crash fix conflicts with the addition of the
new firstuse timestamp.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 files changed:
MAINTAINERS
drivers/net/ethernet/qlogic/qed/qed_main.c
drivers/net/ethernet/qlogic/qed/qed_sriov.h
drivers/net/ethernet/qlogic/qede/qede_main.c
drivers/net/ethernet/ti/cpsw.c
include/net/sch_generic.h
net/core/gen_stats.c
net/ipv6/ip6_output.c
net/rxrpc/rxkad.c
net/sched/act_police.c
net/sched/cls_flower.c
net/sched/sch_drr.c
net/sched/sch_fq_codel.c
net/sched/sch_generic.c
net/sched/sch_hfsc.c
net/sched/sch_prio.c
net/sched/sch_qfq.c
net/sched/sch_red.c
net/sched/sch_tbf.c