Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two cases of overlapping changes, nothing fancy.
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- Documentation/networking/mpls-sysctl.txt 1 addition, 1 deletionDocumentation/networking/mpls-sysctl.txt
- MAINTAINERS 1 addition, 0 deletionsMAINTAINERS
- arch/x86/net/bpf_jit_comp32.c 29 additions, 255 deletionsarch/x86/net/bpf_jit_comp32.c
- drivers/net/bonding/bond_main.c 23 additions, 14 deletionsdrivers/net/bonding/bond_main.c
- drivers/net/dsa/b53/b53_common.c 2 additions, 2 deletionsdrivers/net/dsa/b53/b53_common.c
- drivers/net/dsa/mv88e6xxx/chip.c 2 additions, 0 deletionsdrivers/net/dsa/mv88e6xxx/chip.c
- drivers/net/ethernet/allwinner/sun4i-emac.c 2 additions, 2 deletionsdrivers/net/ethernet/allwinner/sun4i-emac.c
- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c 4 additions, 1 deletiondrivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
- drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c 3 additions, 1 deletiondrivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c 24 additions, 9 deletionsdrivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
- drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h 3 additions, 0 deletionsdrivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
- drivers/net/ethernet/broadcom/bnxt/bnxt.c 13 additions, 7 deletionsdrivers/net/ethernet/broadcom/bnxt/bnxt.c
- drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c 1 addition, 1 deletiondrivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c
- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c 3 additions, 3 deletionsdrivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
- drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c 3 additions, 1 deletiondrivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
- drivers/net/ethernet/cadence/macb.h 8 additions, 1 deletiondrivers/net/ethernet/cadence/macb.h
- drivers/net/ethernet/cadence/macb_ptp.c 5 additions, 2 deletionsdrivers/net/ethernet/cadence/macb_ptp.c
- drivers/net/ethernet/hisilicon/hns/hns_enet.c 1 addition, 0 deletionsdrivers/net/ethernet/hisilicon/hns/hns_enet.c
- drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c 2 additions, 1 deletiondrivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
- drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c 6 additions, 4 deletionsdrivers/net/ethernet/mellanox/mlx5/core/fs_counters.c
Loading
Please register or sign in to comment