github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-12 16:18:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity
master
linux/drivers/net/can/usb
History
Jakub Kicinski 35c2c39832 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Merge in late fixes in preparation for the net-next PR.

Conflicts:

include/net/sch_generic.h
  a6bd339dbb ("net_sched: fix skb memory leak in deferred qdisc drops")
  ff2998f29f ("net: sched: introduce qdisc-specific drop reason tracing")
https://lore.kernel.org/adz0iX85FHMz0HdO@sirena.org.uk

drivers/net/ethernet/airoha/airoha_eth.c
  1acdfbdb51 ("net: airoha: Fix VIP configuration for AN7583 SoC")
  bf3471e6e6 ("net: airoha: Make flow control source port mapping dependent on nbq parameter")

Adjacent changes:

drivers/net/ethernet/airoha/airoha_ppe.c
  f44218cd5e ("net: airoha: Reset PPE cpu port configuration in airoha_ppe_hw_init()")
  7da62262ec ("inet: add ip_local_port_step_width sysctl to improve port usage distribution")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2026-04-14 12:04:00 -07:00
..
etas_es58x can: usb: etas_es58x: correctly anchor the urb in the read bulk callback 2026-03-02 11:03:42 +01:00
kvaser_usb can: kvaser_usb: leaf: refactor endpoint lookup 2026-04-01 09:27:58 +02:00
peak_usb Convert 'alloc_obj' family to use the new default GFP_KERNEL argument 2026-02-21 17:09:51 -08:00
ems_usb.c can: ems_usb: ems_usb_read_bulk_callback(): check the proper length of a message 2026-03-02 11:03:42 +01:00
esd_usb.c can: esd_usb: add endpoint type validation 2026-03-02 11:03:32 +01:00
f81604.c can: usb: f81604: correctly anchor the urb in the read bulk callback 2026-03-02 11:04:15 +01:00
gs_usb.c can: gs_usb: gs_can_open(): always configure bitrates before starting device 2026-03-02 11:09:36 +01:00
Kconfig can: Add Nuvoton NCT6694 CANFD support 2025-09-16 14:41:57 +01:00
Makefile can: Add Nuvoton NCT6694 CANFD support 2025-09-16 14:41:57 +01:00
mcba_usb.c can: mcba_usb: mcba_usb_read_bulk_callback(): fix URB memory leak 2026-01-16 20:40:46 +01:00
nct6694_canfd.c Convert 'alloc_obj' family to use the new default GFP_KERNEL argument 2026-02-21 17:09:51 -08:00
ucan.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-04-14 12:04:00 -07:00
usb_8dev.c can: usb_8dev: usb_8dev_read_bulk_callback(): fix URB memory leak 2026-01-16 20:40:52 +01:00