Conflicts: drivers/net/ethernet/google/gve/gve.h 3ce9345580 ("gve: Secure enough bytes in the first TX desc for all TCP pkts") 75eaae158b ("gve: Add XDP DROP and TX support for GQI-QPL format") https://lore.kernel.org/all/20230406104927.45d176f5@canb.auug.org.au/ https://lore.kernel.org/all/c5872985-1a95-0bc8-9dcc-b6f23b439e9d@tessares.net/ Adjacent changes: net/can/isotp.c 051737439e ("can: isotp: fix race between isotp_sendsmg() and isotp_release()") 96d1c81e6a ("can: isotp: add module parameter for maximum pdu size") Signed-off-by: Jakub Kicinski <kuba@kernel.org>
3ce9345580
75eaae158b
051737439e
96d1c81e6a