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)
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:
1  2 
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

diff --cc MAINTAINERS
Simple merge
index 96a72737f97a870ec04b846e88b820ee6aa20e8c,c90b2b6ad96937feb7f04ef1a8123a73bca061d4..0dd23e409b3ff500bab9da2c311555e3dcd1b557
  #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))
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge