git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Sun, 22 Dec 2019 23:15:05 +0000 (15:15 -0800)
committer	David S. Miller <davem@davemloft.net>
	Sun, 22 Dec 2019 23:15:05 +0000 (15:15 -0800)
commit	ac80010fc94eb0680d9a432b639583bd7ac29066
tree	2de924c048910abfbfff52a3d5188a790ead379f	tree \| snapshot
parent	cfeec3fb5451c2edd0569c0c245868612a417e5f	commit \| diff
parent	c60174717544aa8959683d7e19d568309c3a0c65	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Mere overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>

44 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amazon/ena/ena_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amazon/ena/ena_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/atheros/ag71xx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cortina/gemini.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hip04_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mv643xx_eth.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_router.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/netronome/nfp/flower/main.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qla3xxx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/sfc/efx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/common.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fjes/fjes_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phylink.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/lan78xx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/usbnet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath10k/mac.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_core_main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_core_mpc.h	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l3_main.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/linux/phy.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/sctp/stream.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_core.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history
net/tipc/bcast.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history
net/vmw_vsock/virtio_transport_common.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amazon/ena/ena_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amazon/ena/ena_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/atheros/ag71xx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cortina/gemini.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hip04_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mv643xx_eth.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_router.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/netronome/nfp/flower/main.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qla3xxx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/sfc/efx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/common.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fjes/fjes_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phylink.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/lan78xx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/usbnet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath10k/mac.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_core_main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_core_mpc.h	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l3_main.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/linux/phy.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/sctp/stream.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_core.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history
net/tipc/bcast.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history
net/vmw_vsock/virtio_transport_common.c	diff1 \|	diff2 \|	blob \| history