]> asedeno.scripts.mit.edu Git - linux.git/commit
projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bb1182b bc78d64)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 1 Aug 2017 17:07:50 +0000 (10:07 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 1 Aug 2017 17:07:50 +0000 (10:07 -0700)
commit29fda25a2d31098044f8dfa177c4d2834071828e
tree9e4be11c49a4405c19ece8f81fbb1db478da1055tree | snapshot
parentbb1182bc3e5956a93ab3ef8a3cbfb7966c42a94acommit | diff
parentbc78d646e708dabd1744ca98744dea316f459497commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Two minor conflicts in virtio_net driver (bug fix overlapping addition
of a helper) and MAINTAINERS (new driver edit overlapping revamp of
PHY entry).

Signed-off-by: David S. Miller <davem@davemloft.net>
14 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/genet/bcmgenet.h diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/genet/bcmmii.c diff1 | diff2 | blob | history
drivers/net/ethernet/mediatek/mtk_eth_soc.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.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/tun.c diff1 | diff2 | blob | history
drivers/net/virtio_net.c diff1 | diff2 | blob | history
kernel/bpf/verifier.c diff1 | diff2 | blob | history
net/ipv4/tcp_output.c diff1 | diff2 | blob | history
net/ipv6/ip6_output.c diff1 | diff2 | blob | history
net/packet/af_packet.c diff1 | diff2 | blob | history
net/socket.c diff1 | diff2 | blob | history
local clone of linux.git