projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bd62072 846e8dd)
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 25 Sep 2018 17:35:29 +0000 (10:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 25 Sep 2018 17:35:29 +0000 (10:35 -0700)
commita06ee256e5d6f03fffbd088de9bf84035658cc5a
tree9b88044cd4a46496d15a05b43246810c8b677f46tree | snapshot
parentbd6207202db8974ca3d3183ca0d5611d45b2973ccommit | diff
parent846e8dd47c264e0b359afed28ea88e0acdee6818commit | diff
Merge ra./pub/scm/linux/kernel/git/davem/net

Version bump conflict in batman-adv, take what's in net-next.

iavf conflict, adjustment of netdev_ops in net-next conflicting
with poll controller method removal in net.

Signed-off-by: David S. Miller <davem@davemloft.net>
27 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c diff1 | diff2 | blob | history
drivers/net/ethernet/ibm/emac/core.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/iavf/iavf_main.c diff1 | | blob | history
drivers/net/ethernet/intel/ice/ice_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/igb/igb_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ixgb/ixgb_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/mvneta.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c diff1 | diff2 | blob | history
drivers/net/ethernet/netronome/nfp/nfp_net_common.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qed/qed_dcbx.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qed/qed_dev.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qed/qed_hsi.h diff1 | diff2 | blob | history
drivers/net/ethernet/realtek/r8169.c diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/ravb.h diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/ravb_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c diff1 | diff2 | blob | history
drivers/net/tun.c diff1 | diff2 | blob | history
net/batman-adv/soft-interface.c diff1 | diff2 | blob | history
net/core/ethtool.c diff1 | diff2 | blob | history
net/ipv6/addrconf.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
John Crispins staging tree