Jakub Kicinski d755d45bc0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Merge in late fixes in preparation for the net-next PR. Conflicts: net/tls/tls_sw.c 406e8a651a ("net: skmsg: preserve sg.copy across SG transforms") 79511603a6 ("tls: remove dead sockmap (psock) handling from the SW path") drivers/net/ethernet/microsoft/mana/mana_en.c f8fd56977e ("net: mana: guard TX wq object destroy with INVALID_MANA_HANDLE check") d07efe5a6e ("net: mana: Use per-queue allocation for tx_qp to reduce allocation size") https://lore.kernel.org/ajAPXu-C_PuTgV-a@sirena.org.uk No adjacent changes. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2026-06-16 14:59:58 -07:00
..
atm_misc.c
atm_sysfs.c	atm: remove the local ATM (NSAP) address registry	2026-06-16 08:53:52 -07:00
br2684.c	atm: remove SVC socket support and the signaling daemon interface	2026-06-16 08:53:52 -07:00
common.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2026-06-16 14:59:58 -07:00
common.h	atm: remove SVC socket support and the signaling daemon interface	2026-06-16 08:53:52 -07:00
ioctl.c	atm: remove orphaned uAPI for deleted drivers, protocols and SVCs	2026-06-16 08:53:53 -07:00
Kconfig	net: remove unused ATM protocols and legacy ATM device drivers	2026-04-23 12:21:14 -07:00
Makefile	atm: remove SVC socket support and the signaling daemon interface	2026-06-16 08:53:52 -07:00
pppoatm.c	atm: remove SVC socket support and the signaling daemon interface	2026-06-16 08:53:52 -07:00
proc.c	atm: remove SVC socket support and the signaling daemon interface	2026-06-16 08:53:52 -07:00
protocols.h	atm: remove AAL3/4 transport support	2026-06-16 08:53:51 -07:00
pvc.c	atm: convert to getsockopt_iter	2026-05-22 11:11:09 -07:00
raw.c	atm: remove the unused pre_send and send_bh device operations	2026-06-16 08:53:52 -07:00
resources.c	atm: remove SVC socket support and the signaling daemon interface	2026-06-16 08:53:52 -07:00
resources.h	atm: lift copyin from atm_dev_ioctl()	2020-05-20 20:31:35 -04:00