git.kernel.dk Git - linux-2.6-block.git/commit

author	David S. Miller <davem@davemloft.net>
	Wed, 20 Feb 2019 08:34:07 +0000 (00:34 -0800)
committer	David S. Miller <davem@davemloft.net>
	Wed, 20 Feb 2019 08:34:07 +0000 (00:34 -0800)
commit	375ca548f7e3ac82acdd0959eddd1fa0e17c35cc
tree	5360dc427e4eff7123613419ee522b7fda831de0	tree \| snapshot
parent	58066ac9d7f5dcde4ef08c03b7e127f0522d9ea0	commit \| diff
parent	40e196a906d969fd10d885c692d2674b3d657006	commit \| diff

Merge git://git./linux/kernel/git/davem/net

Two easily resolvable overlapping change conflicts, one in
TCP and one in the eBPF verifier.

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

17 files changed:

drivers/net/dsa/bcm_sf2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/xilinx_gmii2rgmii.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mediatek/mt76/mt76x0/usb.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mesh.h	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_ctl.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/xdp/xdp_umem.c	diff1 \|	diff2 \|	blob \| history
net/xdp/xsk.c	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)

RSS Atom

drivers/net/dsa/bcm_sf2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/xilinx_gmii2rgmii.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mediatek/mt76/mt76x0/usb.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mesh.h	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_ctl.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/xdp/xdp_umem.c	diff1 \|	diff2 \|	blob \| history
net/xdp/xsk.c	diff1 \|	diff2 \|	blob \| history