From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 8 Jan 2021 21:28:00 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v5.12-rc1~200^2~390
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=833d22f2f922bbee6430e558417af060db6bbe9c;p=thirdparty%2Flinux.git

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>
---

833d22f2f922bbee6430e558417af060db6bbe9c