]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e5f12b3 d8e435f)
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
tree77856ad061e97e86027df1fa6efdf20a9fe309b5tree | snapshot
parente5f12b3f5ebb8a6ffd3864a04f687ea0ef78a48acommit | diff
parentd8e435f3ab6fea2ea324dce72b51dd7761747523commit | diff
Merge git://git.kernel.org/pub/scm/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 diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt.c diff1 | diff2 | blob | history
drivers/net/ethernet/ibm/ibmvnic.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/mvneta.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/mvpp2.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/main.c diff1 | diff2 | blob | history
drivers/net/ethernet/synopsys/dwc_eth_qos.c diff1 | diff2 | blob | history
drivers/net/ieee802154/adf7242.c diff1 | diff2 | blob | history
drivers/net/macvlan.c diff1 | diff2 | blob | history
include/linux/netdevice.h diff1 | diff2 | blob | history
init/Kconfig diff1 | diff2 | blob | history
net/core/ethtool.c diff1 | diff2 | blob | history
net/core/flow_dissector.c diff1 | diff2 | blob | history
net/core/rtnetlink.c diff1 | diff2 | blob | history
net/ipv4/udp.c diff1 | diff2 | blob | history
net/ipv6/addrconf.c diff1 | diff2 | blob | history
net/ipv6/udp.c diff1 | diff2 | blob | history
net/l2tp/l2tp_eth.c diff1 | diff2 | blob | history
net/tipc/socket.c diff1 | diff2 | blob | history
Michael's Linux tree.