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

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

author	David S. Miller <davem@davemloft.net>
	Sun, 20 Oct 2019 05:51:25 +0000 (22:51 -0700)
committer	David S. Miller <davem@davemloft.net>
	Sun, 20 Oct 2019 17:43:00 +0000 (10:43 -0700)
commit	91f068e7e905441162aa8f28eeeaba6d4a15441a
tree	25b96db2550014d7f888605abfabb67a7f40a5d3	tree \| snapshot
parent	e60857b9f3a80b4bed3b63bccae7cf43c09f6d9d	commit \| diff
parent	59906de001c5ad7bfbddd5b34be1913f1a7619b8	commit \| diff

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

Several cases of overlapping changes which were for the most
part trivially resolvable.

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

36 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/microchip/ksz9477_i2c.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/sja1105/sja1105.h	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/sja1105/sja1105_ptp.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/genet/bcmgenet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hnae3.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/nxp/lpc_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/pensando/ionic/ionic_lif.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phylink.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mac80211_hwsim.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
include/net/net_namespace.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/rxrpc/peer_object.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_core.c	diff1 \|	diff2 \|	blob \| history
net/tipc/socket.c	diff1 \|	diff2 \|	blob \| history
net/vmw_vsock/virtio_transport_common.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/Makefile	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/libbpf_internal.h	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/xsk.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/test_flow_dissector.sh	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/microchip/ksz9477_i2c.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/sja1105/sja1105.h	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/sja1105/sja1105_ptp.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/genet/bcmgenet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hnae3.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/nxp/lpc_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/pensando/ionic/ionic_lif.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phylink.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mac80211_hwsim.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
include/net/net_namespace.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/rxrpc/peer_object.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_core.c	diff1 \|	diff2 \|	blob \| history
net/tipc/socket.c	diff1 \|	diff2 \|	blob \| history
net/vmw_vsock/virtio_transport_common.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/Makefile	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/libbpf_internal.h	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/xsk.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/test_flow_dissector.sh	diff1 \|	diff2 \|	blob \| history