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

projects / linux-2.6-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0638eb5 83beed7)

author	David S. Miller <davem@davemloft.net>
	Sat, 21 Apr 2018 20:31:52 +0000 (16:31 -0400)
committer	David S. Miller <davem@davemloft.net>
	Sat, 21 Apr 2018 20:32:48 +0000 (16:32 -0400)
commit	e0ada51db907ed2db5d46ad7ff86a8b5df68e59b
tree	858966cee69ad8a50e59c4e02dcbde6ba2916151	tree \| snapshot
parent	0638eb573cde5888c0886c7f35da604e5db209a6	commit \| diff
parent	83beed7b2b26f232d782127792dd0cd4362fdc41	commit \| diff

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

Conflicts were simple overlapping changes in microchip
driver.

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/microchip.c	diff1 \|	diff2 \|	blob \| history
drivers/net/team/team.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
include/linux/microchipphy.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/tipc/node.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/Makefile	diff1 \|	diff2 \|	blob \| history

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