projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4cc5b44 138e4ad)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 2 Sep 2017 00:42:05 +0000 (17:42 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 2 Sep 2017 00:42:05 +0000 (17:42 -0700)
commit6026e043d09012c6269f9a96a808d52d9c498224
treea80578915557db98596821ff60d2ff37dafffb4ftree | snapshot
parent4cc5b44b29a9de9b3f841efedaa3f769066c63cccommit | diff
parent138e4ad67afd5c6c318b056b4d17c17f2c0ca5c0commit | diff
Merge git://git./linux/kernel/git/davem/net

Three cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
78 files changed:
drivers/net/dsa/bcm_sf2.c diff1 | diff2 | blob | history
drivers/net/dsa/bcm_sf2.h diff1 | diff2 | blob | history
drivers/net/ethernet/aquantia/atlantic/aq_ring.c diff1 | diff2 | blob | history
drivers/net/ethernet/aquantia/atlantic/aq_vec.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bcmsysport.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/genet/bcmgenet.c diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c diff1 | diff2 | blob | history
drivers/net/ethernet/faraday/ftgmac100.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/fman/mac.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/mvpp2.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_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c diff1 | diff2 | blob | history
drivers/net/ethernet/netronome/nfp/flower/offload.c diff1 | diff2 | blob | history
drivers/net/ethernet/netronome/nfp/nfp_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/netronome/nfp/nfp_net_common.c diff1 | diff2 | blob | history
drivers/net/ethernet/netronome/nfp/nfp_net_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qlge/qlge_dbg.c diff1 | diff2 | blob | history
drivers/net/hyperv/netvsc_drv.c diff1 | diff2 | blob | history
drivers/net/phy/phy.c diff1 | diff2 | blob | history
drivers/net/phy/phy_device.c diff1 | diff2 | blob | history
drivers/net/usb/cdc_ncm.c diff1 | diff2 | blob | history
drivers/net/virtio_net.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/pcie/internal.h diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/pcie/rx.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/pcie/trans.c diff1 | diff2 | blob | history
include/linux/mlx5/driver.h diff1 | diff2 | blob | history
include/linux/netdevice.h diff1 | diff2 | blob | history
include/linux/skbuff.h diff1 | diff2 | blob | history
include/net/ip6_fib.h diff1 | diff2 | blob | history
include/net/sch_generic.h diff1 | diff2 | blob | history
include/net/tcp.h diff1 | diff2 | blob | history
include/net/udp.h diff1 | diff2 | blob | history
kernel/events/core.c diff1 | diff2 | blob | history
net/core/datagram.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/core/filter.c diff1 | diff2 | blob | history
net/core/skbuff.c diff1 | diff2 | blob | history
net/dsa/dsa2.c diff1 | diff2 | blob | history
net/dsa/tag_ksz.c diff1 | diff2 | blob | history
net/dsa/tag_trailer.c diff1 | diff2 | blob | history
net/ipv4/esp4.c diff1 | diff2 | blob | history
net/ipv4/esp4_offload.c diff1 | diff2 | blob | history
net/ipv4/tcp.c diff1 | diff2 | blob | history
net/ipv4/tcp_cong.c diff1 | diff2 | blob | history
net/ipv4/udp.c diff1 | diff2 | blob | history
net/ipv6/addrconf.c diff1 | diff2 | blob | history
net/ipv6/esp6.c diff1 | diff2 | blob | history
net/ipv6/esp6_offload.c diff1 | diff2 | blob | history
net/ipv6/ip6_fib.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
net/ipv6/udp.c diff1 | diff2 | blob | history
net/kcm/kcmsock.c diff1 | diff2 | blob | history
net/packet/af_packet.c diff1 | diff2 | blob | history
net/sched/cls_api.c diff1 | diff2 | blob | history
net/sched/sch_api.c diff1 | diff2 | blob | history
net/sched/sch_cbq.c diff1 | diff2 | blob | history
net/sched/sch_fq_codel.c diff1 | diff2 | blob | history
net/sched/sch_generic.c diff1 | diff2 | blob | history
net/sched/sch_hfsc.c diff1 | diff2 | blob | history
net/sched/sch_htb.c diff1 | diff2 | blob | history
net/sched/sch_multiq.c diff1 | diff2 | blob | history
net/sched/sch_netem.c diff1 | diff2 | blob | history
net/sched/sch_sfq.c diff1 | diff2 | blob | history
net/sched/sch_tbf.c diff1 | diff2 | blob | history
net/sctp/socket.c diff1 | diff2 | blob | history
net/tipc/bearer.c diff1 | diff2 | blob | history
net/tipc/bearer.h diff1 | diff2 | blob | history
net/tipc/node.c diff1 | diff2 | blob | history
net/xfrm/xfrm_policy.c diff1 | diff2 | blob | history
net/xfrm/xfrm_state.c diff1 | diff2 | blob | history
net/xfrm/xfrm_user.c diff1 | diff2 | blob | history
John Crispins staging tree