mirror of
https://github.com/torvalds/linux.git
synced 2026-05-12 18:14:22 -04:00
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>