projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c23fcbb 1204c70)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 2 Nov 2019 20:12:51 +0000 (13:12 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 2 Nov 2019 20:54:56 +0000 (13:54 -0700)
commitd31e95585ca697fb31440c6fe30113adc85ecfbd
tree4936ea0aaa6b2aeeee4db51e3c60d938c9b9ed96tree | snapshot
parentc23fcbbc6aa4e0bb615e8a7f23e1f32aec235a1ccommit | diff
parent1204c70d9dcba31164f78ad5d8c88c42335d51f8commit | diff
Merge git://git./linux/kernel/git/netdev/net

The only slightly tricky merge conflict was the netdevsim because the
mutex locking fix overlapped a lot of driver reload reorganization.

The rest were (relatively) trivial in nature.

Signed-off-by: David S. Miller <davem@davemloft.net>
50 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/bonding/bond_main.c diff1 | diff2 | blob | history
drivers/net/dsa/bcm_sf2.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c diff1 | diff2 | blob | history
drivers/net/ethernet/faraday/ftgmac100.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/fec_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/igb/igb_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/igc/igc_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/health.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/core.c diff1 | diff2 | blob | history
drivers/net/ethernet/pensando/ionic/ionic_lif.c diff1 | diff2 | blob | history
drivers/net/ethernet/pensando/ionic/ionic_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/realtek/r8169_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c diff1 | diff2 | blob | history
drivers/net/ipvlan/ipvlan_main.c diff1 | diff2 | blob | history
drivers/net/netdevsim/dev.c diff1 | diff2 | blob | history
drivers/net/phy/phylink.c diff1 | diff2 | blob | history
drivers/net/team/team.c diff1 | diff2 | blob | history
drivers/net/usb/lan78xx.c diff1 | diff2 | blob | history
drivers/net/usb/r8152.c diff1 | diff2 | blob | history
drivers/net/vxlan.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/sta.c diff1 | diff2 | blob | history
include/linux/filter.h diff1 | diff2 | blob | history
include/linux/netdevice.h diff1 | diff2 | blob | history
include/linux/skbuff.h diff1 | diff2 | blob | history
include/net/flow_dissector.h diff1 | diff2 | blob | history
include/net/ip_vs.h diff1 | diff2 | blob | history
include/net/net_namespace.h diff1 | diff2 | blob | history
include/net/sock.h diff1 | diff2 | blob | history
kernel/bpf/core.c diff1 | diff2 | blob | history
kernel/bpf/syscall.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/core/flow_dissector.c diff1 | diff2 | blob | history
net/core/rtnetlink.c diff1 | diff2 | blob | history
net/core/sock.c diff1 | diff2 | blob | history
net/dsa/slave.c diff1 | diff2 | blob | history
net/ipv4/tcp.c diff1 | diff2 | blob | history
net/ipv4/tcp_ipv4.c diff1 | diff2 | blob | history
net/netfilter/ipvs/ip_vs_ctl.c diff1 | diff2 | blob | history
net/netfilter/nf_tables_offload.c diff1 | diff2 | blob | history
net/sched/sch_generic.c diff1 | diff2 | blob | history
net/smc/af_smc.c diff1 | diff2 | blob | history
net/smc/smc_core.c diff1 | diff2 | blob | history
net/smc/smc_pnet.c diff1 | diff2 | blob | history
net/tipc/socket.c diff1 | diff2 | blob | history
net/unix/af_unix.c diff1 | diff2 | blob | history
net/wireless/nl80211.c diff1 | diff2 | blob | history
tools/testing/selftests/bpf/test_offload.py diff1 | diff2 | blob | history
John Crispins staging tree