Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 8 Jan 2021 21:28:00 +0000 (13:28 -0800)
committerJakub Kicinski <kuba@kernel.org>
Fri, 8 Jan 2021 21:28:00 +0000 (13:28 -0800)
commit833d22f2f922bbee6430e558417af060db6bbe9c
tree8d2d8824318d53d6d8e3b7bf5680f953a62c2f3b
parent58334e7537278793c86baa88b70c48b0d50b00ae
parent6279d812eab67a6df6b22fa495201db6f2305924
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>
MAINTAINERS
drivers/net/can/m_can/tcan4x5x-core.c
drivers/net/ethernet/marvell/octeontx2/af/cgx.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
net/ipv4/ip_output.c