Merge git://git.kernel.org/pub/scm/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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_main.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_sriov.h
index 96a72737f97a870ec04b846e88b820ee6aa20e8c,c90b2b6ad96937feb7f04ef1a8123a73bca061d4..0dd23e409b3ff500bab9da2c311555e3dcd1b557
--- 1/drivers/net/ethernet/qlogic/qed/qed_sriov.h
--- 2/drivers/net/ethernet/qlogic/qed/qed_sriov.h
+++ b/drivers/net/ethernet/qlogic/qed/qed_sriov.h
@@@ -10,16 -10,15 +10,18 @@@
  #define _QED_SRIOV_H
  #include <linux/types.h>
  #include "qed_vf.h"
 +
 +#define QED_ETH_VF_NUM_MAC_FILTERS 1
 +#define QED_ETH_VF_NUM_VLAN_FILTERS 2
  #define QED_VF_ARRAY_LENGTH (3)
  
+ #ifdef CONFIG_QED_SRIOV
  #define IS_VF(cdev)             ((cdev)->b_is_vf)
  #define IS_PF(cdev)             (!((cdev)->b_is_vf))
- #ifdef CONFIG_QED_SRIOV
  #define IS_PF_SRIOV(p_hwfn)     (!!((p_hwfn)->cdev->p_iov_info))
  #else
+ #define IS_VF(cdev)             (0)
+ #define IS_PF(cdev)             (1)
  #define IS_PF_SRIOV(p_hwfn)     (0)
  #endif
  #define IS_PF_SRIOV_ALLOC(p_hwfn)       (!!((p_hwfn)->pf_iov_info))

diff --cc drivers/net/ethernet/qlogic/qede/qede_main.c
Simple merge

diff --cc drivers/net/ethernet/ti/cpsw.c
Simple merge

diff --cc include/net/sch_generic.h
Simple merge

diff --cc net/core/gen_stats.c
Simple merge

diff --cc net/ipv6/ip6_output.c
Simple merge

diff --cc net/rxrpc/rxkad.c
Simple merge

diff --cc net/sched/act_police.c
Simple merge

diff --cc net/sched/cls_flower.c
Simple merge

diff --cc net/sched/sch_drr.c
Simple merge

diff --cc net/sched/sch_fq_codel.c
Simple merge

diff --cc net/sched/sch_generic.c
Simple merge

diff --cc net/sched/sch_hfsc.c
Simple merge

diff --cc net/sched/sch_prio.c
Simple merge

diff --cc net/sched/sch_qfq.c
Simple merge

diff --cc net/sched/sch_red.c
Simple merge

diff --cc net/sched/sch_tbf.c
Simple merge