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

Browse source

Trivial conflict in CAN, keep the net-next + the byteswap wrapper.

Conflicts:
	drivers/net/can/usb/gs_usb.c

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

...

This commit is contained in:

Jakub Kicinski 2020-11-27 18:25:27 -08:00

parent 6375da9dac c84e1efae0

commit 5c39f26e67

387 changed files with 6414 additions and 2991 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

2

include/uapi/linux/devlink.h

View file

2

include/uapi/linux/openvswitch.h

View file