Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 27 Nov 2016 04:42:21 +0000 (23:42 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 27 Nov 2016 04:42:21 +0000 (23:42 -0500)
commit0b42f25d2f123bb7fbd3565d003a8ea9e1e810fe
tree77856ad061e97e86027df1fa6efdf20a9fe309b5
parente5f12b3f5ebb8a6ffd3864a04f687ea0ef78a48a
parentd8e435f3ab6fea2ea324dce72b51dd7761747523
Merge git://git./linux/kernel/git/davem/net

udplite conflict is resolved by taking what 'net-next' did
which removed the backlog receive method assignment, since
it is no longer necessary.

Two entries were added to the non-priv ethtool operations
switch statement, one in 'net' and one in 'net-next, so
simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
20 files changed:
MAINTAINERS
drivers/net/ethernet/broadcom/bnxt/bnxt.c
drivers/net/ethernet/ibm/ibmvnic.c
drivers/net/ethernet/marvell/mvneta.c
drivers/net/ethernet/marvell/mvpp2.c
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
drivers/net/ethernet/mellanox/mlx5/core/main.c
drivers/net/ethernet/synopsys/dwc_eth_qos.c
drivers/net/ieee802154/adf7242.c
drivers/net/macvlan.c
include/linux/netdevice.h
init/Kconfig
net/core/ethtool.c
net/core/flow_dissector.c
net/core/rtnetlink.c
net/ipv4/udp.c
net/ipv6/addrconf.c
net/ipv6/udp.c
net/l2tp/l2tp_eth.c
net/tipc/socket.c