mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
Cross-merge networking fixes after downstream PR (net-7.3-rc4). Conflicts: net/core/neighbour.c979aabdad8("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/[email protected] https://lore.kernel.org/[email protected] Adjacent changes: net/netlink/af_netlink.cceac0de741("netlink: do not free nlk->groups while lockless readers can use it")7c0ec6288b("net: Replace %pK output with 0") net/bridge/br_vlan.c2842ce397d("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.c18a6fe05fb("net: bridge: mst: move switchdev call outside rcu")120207a08f("net: bridge: vlan: annotate lockless use of msti") drivers/net/ethernet/stmicro/stmmac/hwif.h90e4b849df("net: stmmac: propagate FPE preemption-class mapping errors")85ca3292d7("net: stmmac: Remove ARP offload code") Signed-off-by: Jakub Kicinski <[email protected]>