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

Browse source

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 commit is contained in:

Jakub Kicinski 2021-01-08 13:28:00 -08:00

parent 58334e7537 6279d812ea

commit 833d22f2f9

112 changed files with 1303 additions and 477 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

include/linux/console.h

View file

3

include/linux/mlx5/mlx5_ifc.h

View file

5

include/uapi/linux/if_link.h

View file