Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 30 Aug 2016 04:54:02 +0000 (00:54 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 30 Aug 2016 04:54:02 +0000 (00:54 -0400)
commit6abdd5f5935fff978f950561f3c5175eb34dad73
tree6f3ed3a4f4af9e74436ec9355ebf8201357f1c40
parent0b498a52778368ff501557d68c7b50878ab1701e
parente4e98c460ad38c78498622a164fd5ef09a2dc9cb
Merge git://git./linux/kernel/git/davem/net

All three conflicts were cases of simple overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
40 files changed:
Documentation/networking/dsa/dsa.txt
MAINTAINERS
drivers/infiniband/hw/mlx5/main.c
drivers/net/dsa/bcm_sf2.h
drivers/net/dsa/mv88e6xxx/chip.c
drivers/net/ethernet/atheros/alx/main.c
drivers/net/ethernet/broadcom/bgmac-bcma.c
drivers/net/ethernet/cavium/thunder/nic_reg.h
drivers/net/ethernet/intel/i40e/i40e_client.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
drivers/net/ethernet/mellanox/mlx5/core/cmd.c
drivers/net/ethernet/mellanox/mlx5/core/en.h
drivers/net/ethernet/mellanox/mlx5/core/en_common.c
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
drivers/net/ethernet/mellanox/mlx5/core/main.c
drivers/net/ethernet/mellanox/mlxsw/spectrum.c
drivers/net/ethernet/qlogic/qed/qed.h
drivers/net/ethernet/qlogic/qede/qede_main.c
drivers/net/ethernet/sfc/ef10.c
drivers/net/tun.c
drivers/net/vmxnet3/vmxnet3_drv.c
include/linux/sysctl.h
include/net/tcp.h
include/uapi/linux/if_tunnel.h
lib/rhashtable.c
net/ipv4/tcp.c
net/ipv4/tcp_ipv4.c
net/ipv4/udp.c
net/ipv4/udplite.c
net/ipv6/tcp_ipv6.c
net/ipv6/udp.c
net/ipv6/udplite.c
net/l2tp/l2tp_ppp.c
net/sched/sch_generic.c
net/tipc/udp_media.c