torvalds-linux

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-17 12:00:35 +00:00

History

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

Conflicts:

drivers/net/ethernet/google/gve/gve.h
  3ce934558097 ("gve: Secure enough bytes in the first TX desc for all TCP pkts")
  75eaae158b1b ("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
  051737439eae ("can: isotp: fix race between isotp_sendsmg() and isotp_release()")
  96d1c81e6a04 ("can: isotp: add module parameter for maximum pdu size")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2023-04-06 12:01:20 -07:00

j1939

can: j1939: j1939_tp_tx_dat_new(): fix out-of-bounds memory access

2023-04-05 10:51:57 +02:00

af_can.c

net: af_can: remove useless parameter 'err' in 'can_rx_register()'

2022-12-12 11:41:24 +01:00

af_can.h

…

bcm.c

can: bcm: bcm_tx_setup(): fix KMSAN uninit-value in vfs_write

2023-03-27 14:40:45 +02:00