projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 05bb520 33920f1)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 7 Aug 2019 01:44:57 +0000 (18:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 7 Aug 2019 01:44:57 +0000 (18:44 -0700)
commit13dfb3fa494361ea9a5950f27c9cd8b06d28c04f
tree1bf30874f57c6c6b21160a10282191fcd0868055tree | snapshot
parent05bb520376af2c5146d3c44832c22ec3bb54d778commit | diff
parent33920f1ec5bf47c5c0a1d2113989bdd9dfb3fae9commit | diff
Merge git://git./linux/kernel/git/netdev/net

Just minor overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>
42 files changed:
Documentation/PCI/pci-error-recovery.rst diff1 | diff2 | blob | history
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/can/flexcan.c diff1 | diff2 | blob | history
drivers/net/can/rcar/rcar_canfd.c diff1 | diff2 | blob | history
drivers/net/dsa/mv88e6xxx/chip.c diff1 | diff2 | blob | history
drivers/net/ethernet/agere/et131x.c diff1 | diff2 | blob | history
drivers/net/ethernet/atheros/ag71xx.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt.c diff1 | diff2 | blob | history
drivers/net/ethernet/emulex/benet/be_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/enetc/Kconfig diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/sky2.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_stats.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/spectrum.h diff1 | diff2 | blob | history
drivers/net/ethernet/realtek/r8169_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/rs.c diff1 | diff2 | blob | history
drivers/net/wireless/mac80211_hwsim.c diff1 | diff2 | blob | history
include/linux/mlx5/mlx5_ifc.h diff1 | diff2 | blob | history
include/net/cfg80211.h diff1 | diff2 | blob | history
net/bridge/br_multicast.c diff1 | diff2 | blob | history
net/bridge/br_private.h diff1 | diff2 | blob | history
net/can/gw.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
net/mac80211/mlme.c diff1 | diff2 | blob | history
net/mac80211/util.c diff1 | diff2 | blob | history
net/openvswitch/datapath.c diff1 | diff2 | blob | history
net/rxrpc/ar-internal.h diff1 | diff2 | blob | history
net/sctp/socket.c diff1 | diff2 | blob | history
net/vmw_vsock/hyperv_transport.c diff1 | diff2 | blob | history
net/wireless/core.c diff1 | diff2 | blob | history
net/wireless/nl80211.c diff1 | diff2 | blob | history
John Crispins staging tree