git.osdn.net Git - tomoyo/tomoyo-test1.git/commit

(root) / tomoyo / tomoyo-test1.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	833d22f2f922bbee6430e558417af060db6bbe9c
tree	8d2d8824318d53d6d8e3b7bf5680f953a62c2f3b	tree \| snapshot
parent	58334e7537278793c86baa88b70c48b0d50b00ae	commit \| diff
parent	6279d812eab67a6df6b22fa495201db6f2305924	commit \| diff

Merge git://git./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>

This is a test repository.

RSS Atom

About OSDN

Site Announce
About OSDN
Privacy
Terms of Use
Advertise

Find Software

Search
Find by Categories
Download Ranking
Project Ranking

Develop Software

Create Project/Chamber
What's new
Recently Registered Project
Chambers Map
API

Help

Help Docs
Contact Us
Report Abuse/spam

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/can/m_can/tcan4x5x-core.c	diff1 \|	diff2 \|	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