mirror of
https://github.com/ukui/kernel.git
synced 2026-03-09 10:07:04 -07: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>