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

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

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9fcb5fb 607d144)

author	David S. Miller <davem@davemloft.net>
	Mon, 21 Jan 2019 22:41:32 +0000 (14:41 -0800)
committer	David S. Miller <davem@davemloft.net>
	Mon, 21 Jan 2019 22:41:32 +0000 (14:41 -0800)
commit	2d9fdad1fe27b9aa1fdade7a11971827ae1b49d1
tree	a4628ee966f21963e5e97a6d1a227a3e8138183e	tree \| snapshot
parent	9fcb5fb02361dc41b3f2afc3a094412b9c1cec34	commit \| diff
parent	607d144b83b16847bc18fb058d4d51857c4ff9c6	commit \| diff

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

Completely minor snmp doc conflict.

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

15 files changed:

Documentation/networking/snmp_counter.rst	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macvlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/mdio_bus.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/micrel.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
include/linux/phy.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_fdb.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.