5c39f26e67
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> |
||
---|---|---|
.. | ||
fault-injection | ||
ktest | ||
kunit | ||
nvdimm | ||
radix-tree | ||
scatterlist | ||
selftests | ||
vsock |