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

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

author	Jakub Kicinski <kuba@kernel.org>
	Fri, 8 Jan 2021 21:28:00 +0000 (13:28 -0800)
committer	Jakub Kicinski <kuba@kernel.org>
	Fri, 8 Jan 2021 21:28:00 +0000 (13:28 -0800)
commit	02ead260cec44e68f5cb4fc38f26244bdfd0fac6
tree	8d2d8824318d53d6d8e3b7bf5680f953a62c2f3b	tree \| snapshot
parent	157eb4e88fcb9176e20bf17544f4c68001105f57	commit \| diff
parent	faa297a36a95cf97ff3253a185e91c2ec2f6fbc7	commit \| diff

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

Trivial conflict in CAN on file rename.

Conflicts:
drivers/net/can/m_can/tcan4x5x-core.c

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/can/m_can/tcan4x5x-core.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/marvell/octeontx2/af/cgx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history