github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-06 21:58:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
v7.4-rc1
linux/net/atm
History
Jakub Kicinski f2b5c73c03 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Cross-merge networking fixes after downstream PR (net-7.3-rc4).

Conflicts:

net/core/neighbour.c
  979aabdad8 ("neighbour: Skip default parms when resumed in neightbl_dump_info().")
  7b430fcfc9 ("neighbour: Don't render blackhole_netdev via RTM_GETNEIGHTBL.")
  fae1c59810 ("neighbour: Remove unnecessary net_eq().")
https://lore.kernel.org/20260911173056.44ec06e0@kernel.org
https://lore.kernel.org/aqfbJi7nAX4IbmnR@sirena.co.uk

Adjacent changes:

net/netlink/af_netlink.c
  ceac0de741 ("netlink: do not free nlk->groups while lockless readers can use it")
  7c0ec6288b ("net: Replace %pK output with 0")

net/bridge/br_vlan.c
  2842ce397d ("net: bridge: vlan: fix bugs caused by switchdev deletion errors")
  5bec8f8611 ("net: bridge: vlan: annotate lockless use of num_vlans")
  2b1f8fd311 ("net: bridge: vlan: annotate lockless vlan flags use")

net/bridge/br_mst.c
  18a6fe05fb ("net: bridge: mst: move switchdev call outside rcu")
  120207a08f ("net: bridge: vlan: annotate lockless use of msti")

drivers/net/ethernet/stmicro/stmmac/hwif.h
  90e4b849df ("net: stmmac: propagate FPE preemption-class mapping errors")
  85ca3292d7 ("net: stmmac: Remove ARP offload code")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2026-09-17 14:31:42 -07:00
..
atm_misc.c atm: remove unused exported helpers 2026-07-29 17:54:58 -07:00
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 net/atm: fix slab-out-of-bounds read in vcc_setsockopt() 2026-08-06 09:29:14 -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 pppoatm: ensure a writable skb header and linear data 2026-09-15 17:07:01 -07:00
proc.c net: Replace %pK output with 0 2026-09-02 18:38:16 -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