From: David S. Miller <davem@davemloft.net>
Date: Fri, 10 Jun 2016 18:52:24 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1578b0a5e92825334760741e5c166b8873886f1b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

1578b0a5e92825334760741e5c166b8873886f1b
diff --cc drivers/net/ethernet/qlogic/qed/qed_sriov.h
index 96a72737f97a,c90b2b6ad969..0dd23e409b3f
--- a/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))