Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 9 Jan 2018 15:37:00 +0000 (10:37 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Jan 2018 15:37:00 +0000 (10:37 -0500)
commita0ce093180f2bbb832b3f5583adc640ad67ea568
tree62c9aca5be3566ea4810e4584a02870de8b953f8
parentf4803f1b73f877a571be4c8e531dfcf190acc691
parentef7f8cec80a0ba7bd00ece46844c8994117dc910
Merge git://git./linux/kernel/git/davem/net
38 files changed:
MAINTAINERS
arch/arm/boot/dts/ls1021a-qds.dts
arch/arm/boot/dts/ls1021a-twr.dts
drivers/net/can/flexcan.c
drivers/net/can/vxcan.c
drivers/net/dsa/b53/b53_common.c
drivers/net/ethernet/amazon/ena/ena_netdev.c
drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/intel/i40e/i40e_txrx.c
drivers/net/ethernet/mellanox/mlxsw/spectrum.c
drivers/net/ethernet/mellanox/mlxsw/spectrum.h
drivers/net/ethernet/renesas/sh_eth.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/geneve.c
drivers/net/phy/phylink.c
drivers/net/phy/sfp-bus.c
drivers/net/usb/qmi_wwan.c
include/linux/bpf.h
include/linux/sh_eth.h
include/net/sctp/structs.h
include/uapi/linux/if_ether.h
include/uapi/linux/netfilter/nf_conntrack_common.h
kernel/bpf/syscall.c
net/core/dev.c
net/core/ethtool.c
net/core/rtnetlink.c
net/ipv6/ip6_fib.c
net/ipv6/ip6_tunnel.c
net/mac80211/rx.c
net/netfilter/nf_tables_api.c
net/sched/act_gact.c
net/sched/act_mirred.c
net/sctp/stream.c
net/tipc/group.c
net/wireless/nl80211.c