Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 28 Jan 2017 15:33:06 +0000 (10:33 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sat, 28 Jan 2017 15:33:06 +0000 (10:33 -0500)
commit4e8f2fc1a55d543717efb70e170b09e773d0542b
tree30df1d7fc9dfa24fe2916711a17656682c3f7ec9
parent158f323b9868b59967ad96957c4ca388161be321
parent1b1bc42c1692e9b62756323c675a44cb1a1f9dbd
Merge git://git./linux/kernel/git/davem/net

Two trivial overlapping changes conflicts in MPLS and mlx5.

Signed-off-by: David S. Miller <davem@davemloft.net>
44 files changed:
MAINTAINERS
arch/arm/boot/dts/dra7.dtsi
arch/arm/configs/multi_v7_defconfig
drivers/isdn/hardware/eicon/message.c
drivers/net/ethernet/amd/xgbe/xgbe-drv.c
drivers/net/ethernet/atheros/alx/main.c
drivers/net/ethernet/broadcom/bnxt/bnxt.c
drivers/net/ethernet/ibm/ibmveth.c
drivers/net/ethernet/mediatek/mtk_eth_soc.c
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
drivers/net/ethernet/qlogic/qed/qed_ll2.c
drivers/net/ethernet/qlogic/qed/qed_ll2.h
drivers/net/ethernet/qlogic/qed/qed_roce.c
drivers/net/phy/marvell.c
drivers/net/tun.c
drivers/net/usb/cdc_ether.c
drivers/net/usb/r8152.c
drivers/net/virtio_net.c
drivers/net/vxlan.c
drivers/net/xen-netfront.c
include/linux/bpf.h
include/linux/phy.h
kernel/bpf/syscall.c
net/batman-adv/fragmentation.c
net/bridge/br_netlink.c
net/core/dev.c
net/core/lwt_bpf.c
net/dccp/ipv6.c
net/dsa/slave.c
net/ipv4/ip_tunnel_core.c
net/ipv4/tcp_fastopen.c
net/ipv4/tcp_input.c
net/ipv6/addrconf.c
net/ipv6/inet6_connection_sock.c
net/ipv6/ip6_gre.c
net/ipv6/route.c
net/ipv6/tcp_ipv6.c
net/mpls/af_mpls.c
net/mpls/mpls_iptunnel.c
net/packet/af_packet.c
net/sctp/ipv6.c
net/sctp/socket.c
net/tipc/node.c