Jakub Kicinski 5c39f26e67 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

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>

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

..

af_packet.c

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

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

diag.c

treewide: Add SPDX license identifier for more missed files

2019-05-21 10:50:45 +02:00

internal.h

net/packet: make packet_fanout.arr size configurable up to 64K

2020-11-09 16:41:40 -08:00

Kconfig

treewide: replace '---help---' in Kconfig files with 'help'

2020-06-14 01:57:21 +09:00

Makefile

treewide: Add SPDX license identifier - Makefile/Kconfig

2019-05-21 10:50:46 +02:00